Paul Duffin
83f0d8dc18
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
2017-05-08 19:54:38 +00:00
Paul Duffin
ddc9c28ca8
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
2017-05-08 15:35:04 +01:00
Paul Duffin
3bc673c040
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
2017-05-05 15:30:11 +01:00
TreeHugger Robot
38720b6001
Merge "Import translations. DO NOT MERGE"
2017-05-05 12:07:40 +00:00
Bill Yi
c04084dedd
Import translations. DO NOT MERGE
...
Change-Id: Ie0f5e63446535e0c8ab8652faafc100deeb4b43a
Auto-generated-cl: translation import
2017-05-05 00:02:26 -07:00
Bill Yi
25302cdda8
Import translations. DO NOT MERGE
...
Change-Id: I70ca2d22462fff5fade98a1cb96db5ec6d3a0f7b
Auto-generated-cl: translation import
2017-05-04 23:53:22 -07:00
Alan Viverette
507a88f478
Merge "Use AAPT2" into oc-dev am: a9d9daebd2
...
am: c53f1fbe95
2017-05-02 16:02:31 +00:00
Alan Viverette
c53f1fbe95
Merge "Use AAPT2" into oc-dev
...
am: a9d9daebd2
2017-05-02 13:39:22 +00:00
TreeHugger Robot
a9d9daebd2
Merge "Use AAPT2" into oc-dev
2017-05-02 13:37:23 +00:00
TreeHugger Robot
3c7155e156
Merge "Import translations. DO NOT MERGE"
2017-05-02 01:30:53 +00:00
The Android Open Source Project
207d2ba18a
Import translations. DO NOT MERGE
...
Change-Id: I18120d8f7deddfbf5f6558fc3c0afeddae95017e
Auto-generated-cl: translation import
2017-05-01 09:09:42 -07:00
The Android Open Source Project
92dfcfe1ac
Import translations. DO NOT MERGE
...
Change-Id: I3434bfd7ac54492d1f422e43538381b9f1e65fdf
Auto-generated-cl: translation import
2017-05-01 08:59:32 -07:00
Bill Yi
8b7a74eea0
Merge "Import translations. DO NOT MERGE" into oc-dev am: 2e0a752fd7 -s ours
...
am: 9ec6cef05c
2017-04-29 17:56:31 +00:00
Bill Yi
9c323215cc
Merge "Import translations. DO NOT MERGE" into oc-dev am: d0a66300ff -s ours
...
am: ba04db407e
2017-04-29 17:56:17 +00:00
Bill Yi
9ecf007af7
Merge "Import translations. DO NOT MERGE" into oc-dev am: f262018755 -s ours
...
am: 759445f009
2017-04-29 17:56:02 +00:00
Bill Yi
ba6fdb42cf
Merge "Import translations. DO NOT MERGE" into oc-dev am: b9996623fe -s ours
...
am: c0f5daee33
2017-04-29 17:55:50 +00:00
Bill Yi
13eab1028f
Import translations. DO NOT MERGE am: bd1947dc01 -s ours
...
am: 79036f3994
2017-04-29 17:55:36 +00:00
Bill Yi
9ec6cef05c
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 2e0a752fd7
2017-04-29 17:55:04 +00:00
Bill Yi
ba04db407e
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: d0a66300ff
2017-04-29 17:54:51 +00:00
TreeHugger Robot
2e0a752fd7
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-29 17:53:41 +00:00
Bill Yi
759445f009
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: f262018755
2017-04-29 17:51:57 +00:00
Bill Yi
c0f5daee33
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: b9996623fe
2017-04-29 17:51:46 +00:00
Bill Yi
79036f3994
Import translations. DO NOT MERGE
...
am: bd1947dc01
2017-04-29 17:51:33 +00:00
TreeHugger Robot
d0a66300ff
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-29 17:51:33 +00:00
TreeHugger Robot
a9345933e0
Merge "Import translations. DO NOT MERGE"
2017-04-29 17:50:48 +00:00
TreeHugger Robot
f262018755
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-29 17:50:31 +00:00
TreeHugger Robot
b9996623fe
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-29 17:45:02 +00:00
TreeHugger Robot
2313da2f28
Merge "Import translations. DO NOT MERGE"
2017-04-29 17:26:21 +00:00
TreeHugger Robot
6c8ab5c96b
Merge "Import translations. DO NOT MERGE"
2017-04-29 17:19:43 +00:00
Bill Yi
eddc656980
Import translations. DO NOT MERGE
...
Change-Id: I94f1f0ce565431c31168934cb683a69c1bd56125
Auto-generated-cl: translation import
2017-04-28 23:22:20 -07:00
Bill Yi
34421b01d2
Import translations. DO NOT MERGE
...
Change-Id: I0f815e53170075785b3630f1c524be0e99155483
Auto-generated-cl: translation import
2017-04-28 23:11:24 -07:00
Bill Yi
00b7bc4188
Import translations. DO NOT MERGE
...
Change-Id: I4df7d6c7347ed92a38fd175c46076994b017223b
Auto-generated-cl: translation import
2017-04-28 23:07:20 -07:00
Bill Yi
80a58de7b2
Import translations. DO NOT MERGE
...
Change-Id: I0a55a7e4beabfbc1b9810e315112418b3860ab46
Auto-generated-cl: translation import
2017-04-28 23:03:14 -07:00
Bill Yi
0f8cdf4392
Import translations. DO NOT MERGE
...
Change-Id: Ide2d46f805a5bb36b32d6ebaec8d987973b816ab
Auto-generated-cl: translation import
2017-04-28 22:56:16 -07:00
Bill Yi
bd1947dc01
Import translations. DO NOT MERGE
...
Change-Id: I98560e277103ff606353cff46889ecdb4d7a3b86
Auto-generated-cl: translation import
2017-04-28 22:47:46 -07:00
Bill Yi
cbb6f37771
Import translations. DO NOT MERGE
...
Change-Id: I19cf3418e3bb56a10729741b0d7514533a92f6be
Auto-generated-cl: translation import
2017-04-28 22:44:15 -07:00
Bill Yi
8f9249c48b
Import translations. DO NOT MERGE
...
Change-Id: I13becab3eb65dbb5466387d2781af7226f8dee0e
Auto-generated-cl: translation import
2017-04-28 22:42:11 -07:00
Bill Yi
ac0f5e0a10
Import translations. DO NOT MERGE
...
Change-Id: Ib3dc9dfc6748012de4882a5421993b7bbe825deb
Auto-generated-cl: translation import
2017-04-28 22:41:29 -07:00
TreeHugger Robot
ba4289024c
Merge "Import translations. DO NOT MERGE"
2017-04-26 23:24:54 +00:00
TreeHugger Robot
0fd843839b
Merge "Import translations. DO NOT MERGE"
2017-04-26 23:24:50 +00:00
Alan Viverette
0f6f5c0176
Use AAPT2
...
Test: make checkbuild
Change-Id: I8478dd61a2edf8f87437276025ed57092c1b047c
2017-04-26 16:13:45 -04:00
TreeHugger Robot
7a556699ed
Merge "Import translations. DO NOT MERGE"
2017-04-26 19:48:00 +00:00
Bill Yi
ecc9c1a8da
Import translations. DO NOT MERGE
...
Change-Id: Ia60d6804e3876eaddb40917b121aade6dfe7c2f4
Auto-generated-cl: translation import
2017-04-26 04:50:42 -07:00
Bill Yi
97b297c7d9
Import translations. DO NOT MERGE
...
Change-Id: I486ef948c2cc221a5f1e3efe6fff0796e2a2c027
Auto-generated-cl: translation import
2017-04-26 04:43:46 -07:00
Bill Yi
037b103cb9
Import translations. DO NOT MERGE
...
Change-Id: I6a8ca9b5d1f86a04302024cf2afaa270e330f908
Auto-generated-cl: translation import
2017-04-26 04:42:05 -07:00
Bill Yi
28c83ffcaf
Import translations. DO NOT MERGE
...
Change-Id: I816a54997c43216b469b1a61bfddc744d08bf119
Auto-generated-cl: translation import
2017-04-26 04:40:59 -07:00
Bill Yi
55743cd5d1
Import translations. DO NOT MERGE
...
Change-Id: I3329d221b759894fa4c8e4a579b77f96c1771157
Auto-generated-cl: translation import
2017-04-20 18:44:53 -07:00
Bill Yi
b6ea774669
Import translations. DO NOT MERGE
...
Change-Id: I8c58732d3929a9a7a52b1be4f9bd53c527c77d98
Auto-generated-cl: translation import
2017-04-12 15:11:13 -07:00
Bill Yi
5343c4111e
Merge "Import translations. DO NOT MERGE" into oc-dev am: 0a472ed0df -s ours
...
am: 270c407f95
2017-04-11 19:48:06 +00:00
Bill Yi
91c79c280a
Import translations. DO NOT MERGE am: 8e3bb06f6b -s ours
...
am: c0c8f3b8ea
2017-04-11 19:47:52 +00:00
