aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | 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"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 "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)" into oc-dev-plus-aosp am: 28f867d780 -s ours Change-Id: Ifacc5fa99c5bf427504a6a8a8c71e57e251624b7
| * | | | | | Merge "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-111-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)" into oc-dev-plus-aosp
| | * | | | | | Prepare for removal of junit and android.test classes from Android API (step 1)Paul Duffin2017-05-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for removing junit and android.test classes from the Android API this change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Care was taken to ensure that any targets that depended, directly or indirectly, on android-support-test did not also depend on junit or hamcrest as they conflict with the versions embedded within android-support-test. Bug: 30188076 Test: make checkbuild Change-Id: Icf844999082db141cffcb099aa4004afc7a7c749 Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2
* | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev am: add95c01b9 -s oursBill Yi2017-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4d3b0f119f -s ours Change-Id: Ib7dcfe1de90c6c25fd1bd59cf1261714152d64c6
| * | | | | | | Merge "Import translations. DO NOT MERGE" into oc-devBill Yi2017-05-110-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: add95c01b9 -s ours Change-Id: If0a6f3ad7aede027d34bdce9ca6cceb7457ea210
| | * | | | | | 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-dev am: d20b8bd58d -s oursBill Yi2017-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fd3a13903f -s ours Change-Id: I66a10ca46048c3bdf0f134b66d81352a238d52c5
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into oc-devBill Yi2017-05-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d20b8bd58d -s ours Change-Id: Id10c6493693229151d15ddd872188ace68e73429
| | * | | | | | | 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 MERGE am: 99d1abb252 -s oursBill Yi2017-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7067b4a34f -s ours Change-Id: Ifd99a7bc781a8fa50be033aeef32e20711bb1440
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2017-05-110-0/+0
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 99d1abb252 -s ours Change-Id: I9c07e145ba5f24496df9cee2849e171496ab4697
| | * | | | | | 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-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 "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)" am: 83f0d8dc18 am: 341a052cf9 am: 5151513a15 -s ours am: 439ca466de -s ours Change-Id: Iefca108075e53bcb59dcb71c3d2c21649d0d1964
| * | | | | | Merge "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-080-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)" am: 83f0d8dc18 am: 341a052cf9 am: 5151513a15 -s ours Change-Id: I1551963c45f5d4b94d1fe42d3405350eda4ca389
| | * \ \ \ \ \ Merge "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-081-1/+4
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)" am: 83f0d8dc18 am: 341a052cf9 Change-Id: I32b078a3fbb028bf9f925be3613287ba2bbd9a0d
| | | * | | | | Merge "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-081-1/+4
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)" am: 83f0d8dc18 Change-Id: If0e4bdafb4e4451315b5a7270cfe9526d65b38f4
| | | | * | | | Merge "Prepare for removal of junit and android.test classes from Android ↵Paul Duffin2017-05-081-1/+4
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | API (step 1)"
| | | | * | | | Prepare for removal of junit and android.test classes from Android API (step 1)Paul Duffin2017-05-081-1/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for removing junit and android.test classes from the Android API this change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Care was taken to ensure that any targets that depended, directly or indirectly, on android-support-test did not also depend on junit or hamcrest as they conflict with the versions embedded within android-support-test. Bug: 30188076 Test: make checkbuild Change-Id: I160c136ecd1089a2b13d5cdba9eee1287aad93f9 Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2
* | | | | | | Prepare for removal of junit and android.test classes from Android API (step 1)Paul Duffin2017-05-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for removing junit and android.test classes from the Android API this change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Care was taken to ensure that any targets that depended, directly or indirectly, on android-support-test did not also depend on junit or hamcrest as they conflict with the versions embedded within android-support-test. Bug: 30188076 Test: make checkbuild Change-Id: I743f9e20e1e60836ceba9b9051fa17835deba3a2
* | | | | | | 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"TreeHugger Robot2017-05-022-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEThe Android Open Source Project2017-05-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3434bfd7ac54492d1f422e43538381b9f1e65fdf Auto-generated-cl: translation import
* | | | | | | | Import translations. DO NOT MERGEThe Android Open Source Project2017-05-013-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I18120d8f7deddfbf5f6558fc3c0afeddae95017e Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev am: 2e0a752fd7 -s oursBill Yi2017-04-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9ec6cef05c -s ours Change-Id: Id35b1ef4a3ab1607a34298b71dd74eccd7e62f47
| * | | | | | Merge "Import translations. DO NOT MERGE" into oc-devBill Yi2017-04-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2e0a752fd7 -s ours Change-Id: Id259fc90bee8486de44461f74c250b066abe7e4d
| | * | | | | 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-dev am: d0a66300ff -s oursBill Yi2017-04-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ba04db407e -s ours Change-Id: Iff0d8a4ed10c78fd7edf831d715c386ff2d3aaf3
| * | | | | | Merge "Import translations. DO NOT MERGE" into oc-devBill Yi2017-04-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d0a66300ff -s ours Change-Id: I5bdfc474cabd8734d6de0845ff989d314b4fcfcd
| | * | | | | 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
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-07-23 05:31:01 +0000