aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-08-0727-64/+64
|\
| * Import translations. DO NOT MERGEBill Yi2017-08-0627-64/+64
| | | | | | | | | | | | Change-Id: I0c096a8d2547723cb86d2b4eeeb1ae23af27abff Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-08-071-2/+2
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-08-061-2/+2
| |/ | | | | | | | | | | Change-Id: I1eca86b7e2669a50f3f63eace03aa6eae1ea7e75 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-08-071-1/+1
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-08-061-1/+1
| |/ | | | | | | | | | | Change-Id: I308e6ef94dbffe4df11934adff18eaee5101e42b Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-08-0713-22/+22
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-08-0613-22/+22
| |/ | | | | | | | | | | Change-Id: Idfea205cf778dcf8ca4a0e7794fb4b9632441c1f Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-08-078-9/+9
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-08-068-9/+9
| |/ | | | | | | | | | | Change-Id: Iedf4ea3ed578b904fa9cc269909dab7ff7d26af1 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* / Import translations. DO NOT MERGEBill Yi2017-08-061-1/+1
|/ | | | | | Change-Id: I27db96d1703710e6a8417a3020cc4039979c6086 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* Merge "Revert "Revert "Use AAPT2""" into oc-devAdam Lesinski2017-05-191-1/+6
|\ | | | | | | | | | | am: e6cfc2ff63 Change-Id: I7634a7cedd45ee01facad8cc91316ce7cf1544eb
| * Merge "Revert "Revert "Use AAPT2""" into oc-devTreeHugger Robot2017-05-191-1/+6
| |\
| | * Revert "Revert "Use AAPT2""Adam Lesinski2017-05-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit af1177453d95d727651cf48a380d7979dc94ae45. Reason for revert: Bug in aapt2 was fixed b/38152130 Change-Id: I2701d67f581165d371a745749367c0c825168e22
* | | Merge "Revert "Use AAPT2"" into oc-devAlan Viverette2017-05-161-6/+1
|\| | | | | | | | | | | | | | | | | am: 3ac57504cd Change-Id: I45cb9a9ecfe5d273a2bfd56463c7a7ada868bf67
| * | Merge "Revert "Use AAPT2"" into oc-devTreeHugger Robot2017-05-161-6/+1
| |\|
| | * Revert "Use AAPT2"Alan Viverette2017-05-151-6/+1
| | | | | | | | | | | | | | | | | | This reverts commit 0f6f5c017629befcc4b8d9f1111e18d3505bfac1. Change-Id: Ibba7d35846cdbf6086877fd2859c2e2c91dcf2ee
| * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-05-112-2/+2
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-05-102-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I79556fca866d6054a2327222d73809e93ba80185 Auto-generated-cl: translation import
| * | | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-05-113-4/+4
| |\ \ \
| | * | | Import translations. DO NOT MERGEBill Yi2017-05-103-4/+4
| | |/ / | | | | | | | | | | | | | | | | Change-Id: Id738f4b110ee27a2c18cf8ade15afe67e5b150f8 Auto-generated-cl: translation import
| * / / Import translations. DO NOT MERGEBill Yi2017-05-1013-25/+25
| |/ / | | | | | | | | | | | | Change-Id: Icaa3e3e60a2e632a02a317b0dad32c9c6e3c1072 Auto-generated-cl: translation import
* | | Merge "Use AAPT2" into oc-devAlan Viverette2017-05-021-1/+6
|\| | | | | | | | | | | | | | | | | am: a9d9daebd2 Change-Id: I1c3cf78d426e298d81d1d255c315d4ed95b15afb
| * | Merge "Use AAPT2" into oc-devTreeHugger Robot2017-05-021-1/+6
| |\|
| | * Use AAPT2Alan Viverette2017-04-261-1/+6
| | | | | | | | | | | | | | | Test: make checkbuild Change-Id: I8478dd61a2edf8f87437276025ed57092c1b047c
| * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-294-6/+6
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-04-284-6/+6
| | |/ | | | | | | | | | | | | Change-Id: I19cf3418e3bb56a10729741b0d7514533a92f6be Auto-generated-cl: translation import
| * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-291-2/+2
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-04-281-2/+2
| | |/ | | | | | | | | | | | | Change-Id: Ib3dc9dfc6748012de4882a5421993b7bbe825deb Auto-generated-cl: translation import
| * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-291-1/+1
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-04-281-1/+1
| | |/ | | | | | | | | | | | | Change-Id: I13becab3eb65dbb5466387d2781af7226f8dee0e Auto-generated-cl: translation import
| * | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-2914-33/+33
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-04-2814-33/+33
| | |/ | | | | | | | | | | | | Change-Id: Ide2d46f805a5bb36b32d6ebaec8d987973b816ab Auto-generated-cl: translation import
| * / Import translations. DO NOT MERGEBill Yi2017-04-282-2/+2
| |/ | | | | | | | | Change-Id: I98560e277103ff606353cff46889ecdb4d7a3b86 Auto-generated-cl: translation import
| * Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-111-1/+1
| |\
| | * Import translations. DO NOT MERGEBill Yi2017-04-101-1/+1
| |/ |/| | | | | | | Change-Id: I57c2a9e284ad880ee56a8d40bf88a02a74554069 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBill Yi2017-04-102-2/+2
|/ | | | | Change-Id: Ia6a62ea85b0a61cf94e4dbe20bddcb5aa0e99eba Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2017-03-181-1/+1
| | | | | Change-Id: Ied425f74e8a9ed970d58a1786cceaf4a65dafd25 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2017-03-111-4/+4
| | | | | Change-Id: I88f3eaab760d31e0a6033fc5139eb3d895615868 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-02-281-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2017-02-271-1/+1
| | | | | | | | | | Change-Id: Ic5d0884ead532df33d687f97b77427505f781854 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2017-02-272-3/+3
|/ | | | | Change-Id: I0b37f25bb865080e1af2bbbcda9f75c75df61ace Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2017-02-222-2/+2
| | | | | Change-Id: I9d6915a04bb30cbd529bac3d8b494ab7a4d9373b Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-02-131-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2017-02-131-1/+1
| | | | | | | | | | Change-Id: I25fd4ba408b5cac17e59bde1bce35fe3a873b667 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2017-02-131-1/+1
|/ | | | | Change-Id: Ia23561952613167121f2b8a71e0f513d9b94c3fc Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-02-081-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2017-02-061-1/+1
| | | | | | | | | | Change-Id: Ib8e0ccb864801edb08db48c6470571ba09509f68 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2017-02-061-1/+1
|/ | | | | Change-Id: I85ab7357304db2675724e05d922f9d6580769cac Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-01-271-1/+1
|\
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-07-31 07:51:51 +0000