aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-10-205-8/+8
|\
| * Import translations. DO NOT MERGEBill Yi2017-10-205-8/+8
| | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68003463 Change-Id: Ic7198eb249a6745a8e4a1c4517ce6f2805950383
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-10-202-2/+2
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-10-202-2/+2
| |/ | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68003463 Change-Id: I3ac35f1a243185d7c10eafc64428927dbc95ebe3
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-10-2013-697/+409
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-10-2013-697/+409
| |/ | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68003463 Change-Id: Iaabf04eb63eb41d2e895cdc011a540bf48de95ee
* / Import translations. DO NOT MERGEBill Yi2017-10-204-7/+7
|/ | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68003463 Change-Id: I0b9604ade68baf6adc5a0ce7aaf9351aaeead8ec
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-311-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2017-05-311-1/+1
| | | | | | | | | | Change-Id: I8f7f8dd206a91c73781fbcf24900a631f90f3474 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2017-05-311-1/+1
|/ | | | | Change-Id: I7bc939b0a283fe72d730e9ad0084e1ffa4bd50db Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2017-05-222-4/+4
| | | | | Change-Id: Ib413b1988ad8828fdd42b34e9a2ad26c6237ce5a Auto-generated-cl: translation import
* Merge "Revert "Revert "Use AAPT2""" into oc-dev am: e6cfc2ff63Adam Lesinski2017-05-191-1/+6
|\ | | | | | | | | | | am: e777c7bdc7 Change-Id: Ibf41dc758b32f4b4f0398c5013ad6d3899743f49
| * 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 "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-163-11/+11
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2017-05-163-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I433c4b65242ec711f0198a52e3041e8e2449f8cc Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-161-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2017-05-161-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I59054386d3666143821916c57c3ce9b6cbb3aaa1 Auto-generated-cl: translation import
* | | | | Merge "Revert "Use AAPT2"" into oc-dev am: 3ac57504cdAlan Viverette2017-05-161-6/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | am: 811b5295df Change-Id: Ifbf1782b7c55f7414b29215711c9cb08b69dd256
| * | | 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 "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-115-6/+6
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2017-05-115-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ff5d90c163bfb05bd4d8db583ed1deee5d844c4 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBill Yi2017-05-111-1/+1
|/ / / / | | | | | | | | | | | | | | | | Change-Id: Ifc3bd3ad01d6dc66711756664a51f1340cc8221b Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-097-17/+17
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2017-05-087-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief94504ab531dd149c64aa56ac8ffe1433107e55 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBill Yi2017-05-081-1/+1
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I221b061d69263c60affc309dc69ac3e06041e4a8 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-051-2/+2
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2017-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70ca2d22462fff5fade98a1cb96db5ec6d3a0f7b Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBill Yi2017-05-051-1/+1
|/ / / / | | | | | | | | | | | | | | | | Change-Id: Ie0f5e63446535e0c8ab8652faafc100deeb4b43a Auto-generated-cl: translation import
* | | | Merge "Use AAPT2" into oc-dev am: a9d9daebd2Alan Viverette2017-05-021-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | am: c53f1fbe95 Change-Id: I48d7964e30bb688f66e4295004c03738eef28d6e
| * | | 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
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-08 16:04:53 +0000