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
4d3b0f119f
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: add95c01b9
2017-05-11 05:45:00 +00:00
fd3a13903f
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: d20b8bd58d
2017-05-11 05:44:39 +00:00
7067b4a34f
Import translations. DO NOT MERGE
...
am: 99d1abb252
2017-05-11 05:44:07 +00:00
add95c01b9
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-11 02:52:37 +00:00
d20b8bd58d
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-11 02:05:00 +00:00
99d1abb252
Import translations. DO NOT MERGE
...
Change-Id: Icaa3e3e60a2e632a02a317b0dad32c9c6e3c1072
Auto-generated-cl: translation import
2017-05-10 12:06:09 -07:00
1045ec5158
Import translations. DO NOT MERGE
...
Change-Id: Id738f4b110ee27a2c18cf8ade15afe67e5b150f8
Auto-generated-cl: translation import
2017-05-10 11:57:01 -07:00
c55c0b86f7
Import translations. DO NOT MERGE
...
Change-Id: I79556fca866d6054a2327222d73809e93ba80185
Auto-generated-cl: translation import
2017-05-10 11:55:04 -07:00
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
439ca466de
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 83f0d8dc18 am: 341a052cf9
...
am: 5151513a15
2017-05-08 20:33:35 +00:00
5151513a15
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 83f0d8dc18
...
am: 341a052cf9
2017-05-08 20:14:35 +00:00
341a052cf9
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
...
am: 83f0d8dc18
2017-05-08 20:05:51 +00:00
83f0d8dc18
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
2017-05-08 19:54:38 +00:00
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
c53f1fbe95
Merge "Use AAPT2" into oc-dev
...
am: a9d9daebd2
2017-05-02 13:39:22 +00:00
a9d9daebd2
Merge "Use AAPT2" into oc-dev
2017-05-02 13:37:23 +00:00
9ec6cef05c
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 2e0a752fd7
2017-04-29 17:55:04 +00:00
ba04db407e
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: d0a66300ff
2017-04-29 17:54:51 +00:00
2e0a752fd7
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-29 17:53:41 +00:00
759445f009
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: f262018755
2017-04-29 17:51:57 +00:00
c0f5daee33
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: b9996623fe
2017-04-29 17:51:46 +00:00
d0a66300ff
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-29 17:51:33 +00:00
79036f3994
Import translations. DO NOT MERGE
...
am: bd1947dc01
2017-04-29 17:51:33 +00:00
f262018755
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-29 17:50:31 +00:00
b9996623fe
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-29 17:45:02 +00:00
0f8cdf4392
Import translations. DO NOT MERGE
...
Change-Id: Ide2d46f805a5bb36b32d6ebaec8d987973b816ab
Auto-generated-cl: translation import
2017-04-28 22:56:16 -07:00
bd1947dc01
Import translations. DO NOT MERGE
...
Change-Id: I98560e277103ff606353cff46889ecdb4d7a3b86
Auto-generated-cl: translation import
2017-04-28 22:47:46 -07:00
cbb6f37771
Import translations. DO NOT MERGE
...
Change-Id: I19cf3418e3bb56a10729741b0d7514533a92f6be
Auto-generated-cl: translation import
2017-04-28 22:44:15 -07:00
8f9249c48b
Import translations. DO NOT MERGE
...
Change-Id: I13becab3eb65dbb5466387d2781af7226f8dee0e
Auto-generated-cl: translation import
2017-04-28 22:42:11 -07:00
ac0f5e0a10
Import translations. DO NOT MERGE
...
Change-Id: Ib3dc9dfc6748012de4882a5421993b7bbe825deb
Auto-generated-cl: translation import
2017-04-28 22:41:29 -07:00
0f6f5c0176
Use AAPT2
...
Test: make checkbuild
Change-Id: I8478dd61a2edf8f87437276025ed57092c1b047c
2017-04-26 16:13:45 -04:00
270c407f95
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 0a472ed0df
2017-04-11 18:16:48 +00:00
c0c8f3b8ea
Import translations. DO NOT MERGE
...
am: 8e3bb06f6b
2017-04-11 18:16:35 +00:00
0a472ed0df
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-11 17:58:04 +00:00
8e3bb06f6b
Import translations. DO NOT MERGE
...
Change-Id: Ia6a62ea85b0a61cf94e4dbe20bddcb5aa0e99eba
Auto-generated-cl: translation import
2017-04-10 20:24:49 -07:00
74702b9ab0
Import translations. DO NOT MERGE
...
Change-Id: I57c2a9e284ad880ee56a8d40bf88a02a74554069
Auto-generated-cl: translation import
2017-04-10 20:23:19 -07:00
574742b492
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f58518ea9c -s ours
...
am: 84e782d4d1
2017-04-03 02:28:11 +00:00
84e782d4d1
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: f58518ea9c
2017-04-03 02:21:09 +00:00
f58518ea9c
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-03 02:12:14 +00:00
159713016c
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 76116a45b7 -s ours
...
am: 593bf07724
2017-04-02 08:34:56 +00:00
70dfb95cf5
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7cf67d843c -s ours
...
am: cb19e71124
2017-04-02 08:34:45 +00:00
593bf07724
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 76116a45b7
2017-04-02 08:31:28 +00:00
cb19e71124
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 7cf67d843c
2017-04-02 08:31:16 +00:00
45adfd8ac1
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: fdd8c4bbee -s ours
...
am: 3b5113a48d
2017-04-02 08:25:36 +00:00
69802b7573
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: dfd4523ad3 -s ours
...
am: d72478519e
2017-04-02 08:25:25 +00:00
76116a45b7
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:25:20 +00:00
7cf67d843c
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:25:15 +00:00
bb390ff2e3
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3d0304f5b6 -s ours
...
am: 4e1a184db2
2017-04-02 08:25:15 +00:00
3b5113a48d
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: fdd8c4bbee
2017-04-02 08:22:40 +00:00
Paul Duffin
Bill Yi
TreeHugger Robot
Alan Viverette