aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into oc-dev am: d20b8bd58d -s ours•••am: fd3a13903f -s ours Change-Id: I66a10ca46048c3bdf0f134b66d81352a238d52c5 Bill Yi2017-05-110-0/+0
|\
| * Merge "Import translations. DO NOT MERGE" into oc-dev•••am: d20b8bd58d -s ours Change-Id: Id10c6493693229151d15ddd872188ace68e73429 Bill Yi2017-05-110-0/+0
| |\
| | * Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-05-113-4/+4
| | |\
| | | * Import translations. DO NOT MERGE•••Change-Id: Id738f4b110ee27a2c18cf8ade15afe67e5b150f8 Auto-generated-cl: translation import Bill Yi2017-05-103-4/+4
* | | | Import translations. DO NOT MERGE am: 99d1abb252 -s ours•••am: 7067b4a34f -s ours Change-Id: Ifd99a7bc781a8fa50be033aeef32e20711bb1440 Bill Yi2017-05-110-0/+0
|\| | |
| * | | Import translations. DO NOT MERGE•••am: 99d1abb252 -s ours Change-Id: I9c07e145ba5f24496df9cee2849e171496ab4697 Bill Yi2017-05-110-0/+0
| |\| |
| | * | Import translations. DO NOT MERGE•••Change-Id: Icaa3e3e60a2e632a02a317b0dad32c9c6e3c1072 Auto-generated-cl: translation import Bill Yi2017-05-1013-25/+25
| | |/
* | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-097-17/+17
|\ \ \
| * | | Import translations. DO NOT MERGE•••Change-Id: Ief94504ab531dd149c64aa56ac8ffe1433107e55 Auto-generated-cl: translation import Bill Yi2017-05-087-17/+17
* | | | Import translations. DO NOT MERGE•••Change-Id: I221b061d69263c60affc309dc69ac3e06041e4a8 Auto-generated-cl: translation import Bill Yi2017-05-081-1/+1
|/ / /
* | | Merge "Prepare for removal of junit and android.test classes from Android API...•••am: 439ca466de -s ours Change-Id: Iefca108075e53bcb59dcb71c3d2c21649d0d1964 Paul Duffin2017-05-080-0/+0
|\| |
| * | Merge "Prepare for removal of junit and android.test classes from Android API...•••am: 5151513a15 -s ours Change-Id: I1551963c45f5d4b94d1fe42d3405350eda4ca389 Paul Duffin2017-05-080-0/+0
| |\ \
| | * \ Merge "Prepare for removal of junit and android.test classes from Android API...•••am: 341a052cf9 Change-Id: I32b078a3fbb028bf9f925be3613287ba2bbd9a0d Paul Duffin2017-05-081-1/+4
| | |\ \
| | | * \ Merge "Prepare for removal of junit and android.test classes from Android API...•••am: 83f0d8dc18 Change-Id: If0e4bdafb4e4451315b5a7270cfe9526d65b38f4 Paul Duffin2017-05-081-1/+4
| | | |\ \
| | | | * | Merge "Prepare for removal of junit and android.test classes from Android API...Paul Duffin2017-05-081-1/+4
| | | |/| |
| | | | * | Prepare for removal of junit and android.test classes from Android API (step 1)•••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 Paul Duffin2017-05-081-1/+4
| | | |/ /
* | | | | Prepare for removal of junit and android.test classes from Android API (step 1)•••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 Paul Duffin2017-05-051-1/+4
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-051-2/+2
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGE•••Change-Id: I70ca2d22462fff5fade98a1cb96db5ec6d3a0f7b Auto-generated-cl: translation import Bill Yi2017-05-041-2/+2
* | | | | | Import translations. DO NOT MERGE•••Change-Id: Ie0f5e63446535e0c8ab8652faafc100deeb4b43a Auto-generated-cl: translation import Bill Yi2017-05-051-1/+1
|/ / / / /
* | | | | Merge "Use AAPT2" into oc-dev am: a9d9daebd2•••am: c53f1fbe95 Change-Id: I48d7964e30bb688f66e4295004c03738eef28d6e Alan Viverette2017-05-021-1/+6
|\| | | |
| * | | | Merge "Use AAPT2" into oc-dev•••am: a9d9daebd2 Change-Id: I1c3cf78d426e298d81d1d255c315d4ed95b15afb Alan Viverette2017-05-021-1/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Use AAPT2" into oc-devTreeHugger Robot2017-05-021-1/+6
| | |\ \ \
| | | * | | Use AAPT2•••Test: make checkbuild Change-Id: I8478dd61a2edf8f87437276025ed57092c1b047c Alan Viverette2017-04-261-1/+6
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-05-022-2/+2
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGE•••Change-Id: I3434bfd7ac54492d1f422e43538381b9f1e65fdf Auto-generated-cl: translation import The Android Open Source Project2017-05-012-2/+2
* | | | | | | Import translations. DO NOT MERGE•••Change-Id: I18120d8f7deddfbf5f6558fc3c0afeddae95017e Auto-generated-cl: translation import The Android Open Source Project2017-05-013-3/+3
|/ / / / / /
* | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev am: 2e0a752fd7 -s ours•••am: 9ec6cef05c -s ours Change-Id: Id35b1ef4a3ab1607a34298b71dd74eccd7e62f47 Bill Yi2017-04-290-0/+0
|\| | | | |
| * | | | | Merge "Import translations. DO NOT MERGE" into oc-dev•••am: 2e0a752fd7 -s ours Change-Id: Id259fc90bee8486de44461f74c250b066abe7e4d Bill Yi2017-04-290-0/+0
| |\| | | |
| | * | | | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-294-6/+6
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGE•••Change-Id: I19cf3418e3bb56a10729741b0d7514533a92f6be Auto-generated-cl: translation import Bill Yi2017-04-284-6/+6
| | | |/ / /
* | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev am: d0a66300ff -s ours•••am: ba04db407e -s ours Change-Id: Iff0d8a4ed10c78fd7edf831d715c386ff2d3aaf3 Bill Yi2017-04-290-0/+0
|\| | | | |
| * | | | | Merge "Import translations. DO NOT MERGE" into oc-dev•••am: d0a66300ff -s ours Change-Id: I5bdfc474cabd8734d6de0845ff989d314b4fcfcd Bill Yi2017-04-290-0/+0
| |\| | | |
| | * | | | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-291-2/+2
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGE•••Change-Id: Ib3dc9dfc6748012de4882a5421993b7bbe825deb Auto-generated-cl: translation import Bill Yi2017-04-281-2/+2
| | | |/ / /
* | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev am: f262018755 -s ours•••am: 759445f009 -s ours Change-Id: I7ae2c7b42fd6ebec996565ece6bbdc9c4d4a5d1e Bill Yi2017-04-290-0/+0
|\| | | | |
| * | | | | Merge "Import translations. DO NOT MERGE" into oc-dev•••am: f262018755 -s ours Change-Id: I91ee52ad8985fb4986649cee89e6d5bef96f76ac Bill Yi2017-04-290-0/+0
| |\| | | |
| | * | | | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-291-1/+1
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGE•••Change-Id: I13becab3eb65dbb5466387d2781af7226f8dee0e Auto-generated-cl: translation import Bill Yi2017-04-281-1/+1
| | | |/ / /
* | | | | | Merge "Import translations. DO NOT MERGE" into oc-dev am: b9996623fe -s ours•••am: c0f5daee33 -s ours Change-Id: Ifcc04dff7f6f0515fb44021c4ccaa6e19dc271c1 Bill Yi2017-04-290-0/+0
|\| | | | |
| * | | | | Merge "Import translations. DO NOT MERGE" into oc-dev•••am: b9996623fe -s ours Change-Id: I0db32e9c8a308037ed7e93ea996f12a38c400be7 Bill Yi2017-04-290-0/+0
| |\| | | |
| | * | | | Merge "Import translations. DO NOT MERGE" into oc-devTreeHugger Robot2017-04-2914-33/+33
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGE•••Change-Id: Ide2d46f805a5bb36b32d6ebaec8d987973b816ab Auto-generated-cl: translation import Bill Yi2017-04-2814-33/+33
| | | |/ / /
* | | | | | Import translations. DO NOT MERGE am: bd1947dc01 -s ours•••am: 79036f3994 -s ours Change-Id: I279299e9aea31a59836f4b8f44bc14af3008f82b Bill Yi2017-04-290-0/+0
|\| | | | |
| * | | | | Import translations. DO NOT MERGE•••am: bd1947dc01 -s ours Change-Id: Ic694a675584beee381663e01f0aacd48d868c2f2 Bill Yi2017-04-290-0/+0
| |\| | | |
| | * | | | Import translations. DO NOT MERGE•••Change-Id: I98560e277103ff606353cff46889ecdb4d7a3b86 Auto-generated-cl: translation import Bill Yi2017-04-282-2/+2
| | |/ / /
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-04-2911-18/+18
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGE•••Change-Id: I94f1f0ce565431c31168934cb683a69c1bd56125 Auto-generated-cl: translation import Bill Yi2017-04-2811-18/+18
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-04-291-2/+2
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGE•••Change-Id: I0a55a7e4beabfbc1b9810e315112418b3860ab46 Auto-generated-cl: translation import Bill Yi2017-04-281-2/+2
| |/ / / / /