Commit Graph

40123 Commits (95a40970122f2a3951fbe2240ebbcb70d2bc1c8d)

Author SHA1 Message Date
Bill Yi 95a4097012 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ifb4f7a04efd3ce6cca3a92fbd1edbec31a3d8fbb
2017-10-16 15:16:21 -07:00
TreeHugger Robot e5580385b1 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-08-05 13:32:26 +00:00
TreeHugger Robot 4e6a16562f Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-08-05 13:14:07 +00:00
TreeHugger Robot 1c5760eeae Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-08-05 13:12:40 +00:00
Bill Yi aee9e596da Import translations. DO NOT MERGE
Change-Id: Ic0b774fdb8cbc8507e6534c13b3d64db79031dea
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 04:04:08 -07:00
Bill Yi 2edf45cf58 Import translations. DO NOT MERGE
Change-Id: I6c77cd10984dd07fe76ae62b4839b801b1aa7650
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 03:56:02 -07:00
Bill Yi 07d9ac7511 Import translations. DO NOT MERGE
Change-Id: I33047c58713582da7ed206b22faa4ff11024cf9d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 03:54:25 -07:00
Bill Yi 8c41d69776 Import translations. DO NOT MERGE
Change-Id: Ib837b11a00db2397e55a6258b4ce69bbd7d93442
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 03:52:22 -07:00
Bill Yi 4a6a014605 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s ours
am: 9467382a44  -s ours

Change-Id: I33d15a705ef8eabba215efb59a4b583111b34265
2017-07-27 00:56:55 +00:00
Bill Yi 9467382a44 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 01422e1ff5  -s ours

Change-Id: I7745987e0e30d8bde20015409da01213fc8903d8
2017-07-26 23:23:05 +00:00
Bill Yi c3e81eb7d2 Import translations. DO NOT MERGE am: 03907bdaeb -s ours
am: e688963174  -s ours

Change-Id: Icd0cd7480d2692272c8ddebd6e8fb94d1bb0fcc9
2017-07-26 22:03:00 +00:00
TreeHugger Robot 01422e1ff5 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-07-26 22:01:56 +00:00
Bill Yi e688963174 Import translations. DO NOT MERGE
am: 03907bdaeb  -s ours

Change-Id: I5a88544c53e5411b1234bd5fad0c1408141a62ec
2017-07-26 21:56:09 +00:00
Bill Yi 03907bdaeb Import translations. DO NOT MERGE
Change-Id: I83d6d6794644e7bf00bcd3e9d24f801dd0f26ec7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 11:28:31 -07:00
Bill Yi cd23c7560e Import translations. DO NOT MERGE
Change-Id: Ie2ee3d601e39084145911761b1204e5f4cafd219
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 11:28:18 -07:00
Bill Yi 3025a229ba Import translations. DO NOT MERGE
Change-Id: Ib4e62fdb016fe7a1bf1af921ca278c6163e7da01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 07:29:34 -07:00
TreeHugger Robot 6e0024e801 Merge "Import translations. DO NOT MERGE" 2017-05-31 18:11:26 +00:00
Bill Yi 1880e627be Import translations. DO NOT MERGE
Change-Id: I8f7f8dd206a91c73781fbcf24900a631f90f3474
Auto-generated-cl: translation import
2017-05-31 04:29:35 -07:00
Bill Yi 9cad1fd7c9 Import translations. DO NOT MERGE
Change-Id: I7bc939b0a283fe72d730e9ad0084e1ffa4bd50db
Auto-generated-cl: translation import
2017-05-31 04:11:21 -07:00
Bill Yi 368535de6b Import translations. DO NOT MERGE
Change-Id: Ib413b1988ad8828fdd42b34e9a2ad26c6237ce5a
Auto-generated-cl: translation import
2017-05-22 17:58:33 -07:00
Adam Lesinski 267afc85d4 Merge "Revert "Revert "Use AAPT2""" into oc-dev am: e6cfc2ff63
am: e777c7bdc7

Change-Id: Ibf41dc758b32f4b4f0398c5013ad6d3899743f49
2017-05-19 00:20:30 +00:00
Adam Lesinski e777c7bdc7 Merge "Revert "Revert "Use AAPT2""" into oc-dev
am: e6cfc2ff63

Change-Id: I7634a7cedd45ee01facad8cc91316ce7cf1544eb
2017-05-19 00:12:43 +00:00
TreeHugger Robot e6cfc2ff63 Merge "Revert "Revert "Use AAPT2""" into oc-dev 2017-05-19 00:00:48 +00:00
Adam Lesinski 8c210e3948 Revert "Revert "Use AAPT2""
This reverts commit af1177453d.

Reason for revert: Bug in aapt2 was fixed b/38152130

Change-Id: I2701d67f581165d371a745749367c0c825168e22
2017-05-17 22:54:28 +00:00
TreeHugger Robot c0d03f79bd Merge "Import translations. DO NOT MERGE" 2017-05-16 18:12:59 +00:00
TreeHugger Robot 709da7e3f4 Merge "Import translations. DO NOT MERGE" 2017-05-16 18:08:17 +00:00
Bill Yi 80bc1d494f Import translations. DO NOT MERGE
Change-Id: I59054386d3666143821916c57c3ce9b6cbb3aaa1
Auto-generated-cl: translation import
2017-05-16 09:10:00 -07:00
Bill Yi ee7e6e9c8d Import translations. DO NOT MERGE
Change-Id: I433c4b65242ec711f0198a52e3041e8e2449f8cc
Auto-generated-cl: translation import
2017-05-16 08:59:55 -07:00
Alan Viverette adafcbe7a9 Merge "Revert "Use AAPT2"" into oc-dev am: 3ac57504cd
am: 811b5295df

Change-Id: Ifbf1782b7c55f7414b29215711c9cb08b69dd256
2017-05-16 02:17:48 +00:00
Alan Viverette 811b5295df Merge "Revert "Use AAPT2"" into oc-dev
am: 3ac57504cd

Change-Id: I45cb9a9ecfe5d273a2bfd56463c7a7ada868bf67
2017-05-16 01:09:31 +00:00
TreeHugger Robot 3ac57504cd Merge "Revert "Use AAPT2"" into oc-dev 2017-05-16 01:05:09 +00:00
Alan Viverette af1177453d Revert "Use AAPT2"
This reverts commit 0f6f5c0176.

Change-Id: Ibba7d35846cdbf6086877fd2859c2e2c91dcf2ee
2017-05-15 23:06:07 +00:00
TreeHugger Robot c50b698341 Merge "Import translations. DO NOT MERGE" 2017-05-11 18:31:13 +00:00
Bill Yi 74ac863343 Import translations. DO NOT MERGE
Change-Id: I5ff5d90c163bfb05bd4d8db583ed1deee5d844c4
Auto-generated-cl: translation import
2017-05-11 07:38:49 -07:00
Bill Yi 441fbc5b91 Import translations. DO NOT MERGE
Change-Id: Ifc3bd3ad01d6dc66711756664a51f1340cc8221b
Auto-generated-cl: translation import
2017-05-11 07:16:51 -07:00
Paul Duffin fc91fc0582 Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp
am: 28f867d780  -s ours

Change-Id: Ifacc5fa99c5bf427504a6a8a8c71e57e251624b7
2017-05-11 11:53:32 +00:00
Bill Yi 9f55244cb3 Merge "Import translations. DO NOT MERGE" into oc-dev am: add95c01b9 -s ours
am: 4d3b0f119f  -s ours

Change-Id: Ib7dcfe1de90c6c25fd1bd59cf1261714152d64c6
2017-05-11 11:53:07 +00:00
Bill Yi 0ad0c4be34 Merge "Import translations. DO NOT MERGE" into oc-dev am: d20b8bd58d -s ours
am: fd3a13903f  -s ours

Change-Id: I66a10ca46048c3bdf0f134b66d81352a238d52c5
2017-05-11 11:52:40 +00:00
Bill Yi 58cbd4a8a2 Import translations. DO NOT MERGE am: 99d1abb252 -s ours
am: 7067b4a34f  -s ours

Change-Id: Ifd99a7bc781a8fa50be033aeef32e20711bb1440
2017-05-11 11:52:14 +00:00
Paul Duffin 28f867d780 Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp 2017-05-11 11:31:19 +00:00
Bill Yi 4d3b0f119f Merge "Import translations. DO NOT MERGE" into oc-dev
am: add95c01b9  -s ours

Change-Id: If0a6f3ad7aede027d34bdce9ca6cceb7457ea210
2017-05-11 05:45:00 +00:00
Bill Yi fd3a13903f Merge "Import translations. DO NOT MERGE" into oc-dev
am: d20b8bd58d  -s ours

Change-Id: Id10c6493693229151d15ddd872188ace68e73429
2017-05-11 05:44:39 +00:00
Bill Yi 7067b4a34f Import translations. DO NOT MERGE
am: 99d1abb252  -s ours

Change-Id: I9c07e145ba5f24496df9cee2849e171496ab4697
2017-05-11 05:44:07 +00:00
TreeHugger Robot add95c01b9 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-11 02:52:37 +00:00
TreeHugger Robot d20b8bd58d Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-11 02:05:00 +00:00
Bill Yi 99d1abb252 Import translations. DO NOT MERGE
Change-Id: Icaa3e3e60a2e632a02a317b0dad32c9c6e3c1072
Auto-generated-cl: translation import
2017-05-10 12:06:09 -07:00
Bill Yi 1045ec5158 Import translations. DO NOT MERGE
Change-Id: Id738f4b110ee27a2c18cf8ade15afe67e5b150f8
Auto-generated-cl: translation import
2017-05-10 11:57:01 -07:00
Bill Yi c55c0b86f7 Import translations. DO NOT MERGE
Change-Id: I79556fca866d6054a2327222d73809e93ba80185
Auto-generated-cl: translation import
2017-05-10 11:55:04 -07:00
Paul Duffin 381c38a127 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: Icf844999082db141cffcb099aa4004afc7a7c749
Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2
2017-05-10 09:45:07 +01:00
TreeHugger Robot fa081f77d7 Merge "Import translations. DO NOT MERGE" 2017-05-09 03:11:07 +00:00