summaryrefslogtreecommitdiff
path: root/java
Commit message (Expand)AuthorAgeFilesLines
...
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-06-211-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2017-06-201-1/+1
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-06-211-1/+1
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-06-201-1/+1
| |/
* / Import translations. DO NOT MERGEBill Yi2017-06-201-2/+2
|/
* Import translations. DO NOT MERGEBill Yi2017-06-121-1/+1
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-311-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2017-05-311-1/+1
* | Import translations. DO NOT MERGEBill Yi2017-05-311-1/+1
|/
* Import translations. DO NOT MERGEBill Yi2017-05-222-4/+4
* Merge "Revert "Revert "Use AAPT2""" into oc-dev am: e6cfc2ff63Adam Lesinski2017-05-191-1/+6
|\
| * Merge "Revert "Revert "Use AAPT2""" into oc-devAdam Lesinski2017-05-191-1/+6
| |\
| | * Merge "Revert "Revert "Use AAPT2""" into oc-devTreeHugger Robot2017-05-191-1/+6
| | |\
| | | * Revert "Revert "Use AAPT2""Adam Lesinski2017-05-171-1/+6
* | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-163-11/+11
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2017-05-163-11/+11
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-161-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2017-05-161-1/+1
| |/ / / /
* | | | | Merge "Revert "Use AAPT2"" into oc-dev am: 3ac57504cdAlan Viverette2017-05-161-6/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge "Revert "Use AAPT2"" into oc-devAlan Viverette2017-05-161-6/+1
| |\| |
| | * | Merge "Revert "Use AAPT2"" into oc-devTreeHugger Robot2017-05-161-6/+1
| | |\|
| | | * Revert "Use AAPT2"Alan Viverette2017-05-151-6/+1
| | * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-05-112-2/+2
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2017-05-102-2/+2
| | * | | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-05-113-4/+4
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2017-05-103-4/+4
| | | |/ /
| | * / / Import translations. DO NOT MERGEBill Yi2017-05-1013-25/+25
| | |/ /
* | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-115-6/+6
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2017-05-115-6/+6
* | | | | Import translations. DO NOT MERGEBill Yi2017-05-111-1/+1
|/ / / /
* | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-097-17/+17
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2017-05-087-17/+17
* | | | | Import translations. DO NOT MERGEBill Yi2017-05-081-1/+1
|/ / / /
* | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-051-2/+2
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2017-05-041-2/+2
* | | | | Import translations. DO NOT MERGEBill Yi2017-05-051-1/+1
|/ / / /
* | | | Merge "Use AAPT2" into oc-dev am: a9d9daebd2Alan Viverette2017-05-021-1/+6
|\| | |
| * | | Merge "Use AAPT2" into oc-devAlan Viverette2017-05-021-1/+6
| |\| |
| | * | Merge "Use AAPT2" into oc-devTreeHugger Robot2017-05-021-1/+6
| | |\|
| | | * Use AAPT2Alan Viverette2017-04-261-1/+6
| | * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-294-6/+6
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2017-04-284-6/+6
| | | |/
| | * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-291-2/+2
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2017-04-281-2/+2
| | | |/
| | * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-291-1/+1
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2017-04-281-1/+1
| | | |/
| | * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-2914-33/+33
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2017-04-2814-33/+33
| | | |/
| | * / Import translations. DO NOT MERGEBill Yi2017-04-282-2/+2
| | |/
| | * Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-111-1/+1
| | |\