d373b6c4a5
Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" am: 87c6fcf126
...
am: 88f12fdcce
2017-12-13 01:44:36 +00:00
88f12fdcce
Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"
...
am: 87c6fcf126
2017-12-13 01:12:43 +00:00
87c6fcf126
Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"
2017-12-12 23:26:41 +00:00
85c065986f
Use a.t.mock.stubs instead of a.t.mock.sdk
...
Remove dependencies on android.test.mock.sdk as it is a duplicate of
android.test.mock.stubs and will be removed.
The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.
* tests/Android.mk
Replaced 'android.test.mock.sdk' with 'android.test.mock.stubs' in
LOCAL_JAVA_LIBRARIES because android.test.mock.sdk has been
deprecated.
Bug: 30188076
Test: make checkbuild
Change-Id: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1
Merged-In: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1
(cherry picked from commit 097130d198
2017-12-07 13:34:41 -08:00
55cf499d38
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d8a341b914 -s ours
...
am: 6819b9691a
2017-12-07 15:39:59 +00:00
6819b9691a
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
...
am: d8a341b914
2017-12-07 15:34:01 +00:00
7278f39f05
DO NOT MERGE: Merge Oreo MR1 into master am: f630b9d122 -s ours
...
am: be28cec210
2017-12-07 07:08:24 +00:00
be28cec210
DO NOT MERGE: Merge Oreo MR1 into master
...
am: f630b9d122
2017-12-07 04:39:13 +00:00
d8a341b914
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
2017-12-06 23:18:26 +00:00
f630b9d122
DO NOT MERGE: Merge Oreo MR1 into master
...
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ib1ef5bebfccf8eab11bb080c0e13cdf4cff9e79e
2017-12-06 14:24:54 -08:00
6c15e41132
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: f99e090a59
2017-11-30 01:49:01 +00:00
3357121876
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: b6355a66f7
2017-11-30 01:48:37 +00:00
972a9c71a5
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: b9d6be45b3
2017-11-30 01:48:13 +00:00
fee92ba29d
Import translations. DO NOT MERGE
...
am: 39973180c7
2017-11-30 01:47:48 +00:00
f99e090a59
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-11-30 01:30:16 +00:00
b6355a66f7
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-11-30 01:30:00 +00:00
b9d6be45b3
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-11-30 01:26:34 +00:00
83cce9a2c6
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 69925163
Change-Id: I27a8a609dbedec443ec0efcb5a9624a30109a2dd
2017-11-29 15:24:23 -08:00
c34ef720ca
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 69925163
Change-Id: I24694255d2be60a04d11630f1f738b8e84eaeaa0
2017-11-29 15:14:33 -08:00
507946daee
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 69925163
Change-Id: I04fb48059e4b43c0093ff661dc15f7471f58821b
2017-11-29 15:12:28 -08:00
39973180c7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 69925163
Change-Id: I0303d0946be41a5bea10906e4c83de2288720df0
2017-11-29 15:10:28 -08:00
a4843aaec0
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
Change-Id: I09ea85c7e1d2723c995b7713ebe2c0cd512c5838
2017-11-14 16:38:24 -08:00
e2a1657453
Merge commit 'e6db3dd483747a8f3055c003c706b0c7e7f14db0' into HEAD
...
Change-Id: I1dc30ae47185eb72a0c0cda05b336c429c20d6de
2017-11-13 14:35:47 -08:00
d04a2c6eaf
Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: a3addf1187
...
am: f886546409
2017-11-03 00:53:24 +00:00
f886546409
Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni"
...
am: a3addf1187
2017-11-03 00:51:12 +00:00
a3addf1187
Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni"
2017-11-03 00:47:18 +00:00
fab2c3c0ea
Use -Werror in packages/inputmethods/LatinIME/native/jni
...
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I6b91302908e147077bb4fd0a8718c39357337133
2017-11-02 10:18:54 -07:00
4424dbc80b
Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: f3681fed6d
...
am: 707fd5c3d2
2017-10-30 19:45:38 +00:00
707fd5c3d2
Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni"
...
am: f3681fed6d
2017-10-30 19:40:45 +00:00
f3681fed6d
Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni"
2017-10-30 19:26:28 +00:00
1da7b0c5bb
Use -Werror in packages/inputmethods/LatinIME/native/jni
...
* Suppress warning on unused loop index variable.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ia3f0f9cc4cb0ebeeac9b1ff51955597a725c87ef
2017-10-20 15:19:55 -07:00
ffa65d4823
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 21a3e7ef7a -s ours
...
am: 26fe9fffde
2017-10-20 17:16:39 +00:00
26fe9fffde
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 21a3e7ef7a
2017-10-20 16:39:22 +00:00
a588e32070
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0a366715cd -s ours
...
am: 93774e5a5e
2017-10-20 15:58:30 +00:00
20fee8e668
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 93be386157 -s ours
...
am: 086c57be76
2017-10-20 15:58:12 +00:00
2eb5c28fe1
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2bca12199c -s ours
...
am: ecfa001cf9
2017-10-20 15:57:54 +00:00
878ebba950
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4aa13976be -s ours
...
am: ba670b4126
2017-10-20 15:57:37 +00:00
978c0ec339
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 84a268bdaa -s ours
...
am: f7da4a81c6
2017-10-20 15:57:19 +00:00
9eab93b1db
Import translations. DO NOT MERGE am: d5fa4b82f1 -s ours
...
am: 44bdd48a48
2017-10-20 15:57:00 +00:00
93774e5a5e
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 0a366715cd
2017-10-20 15:30:51 +00:00
086c57be76
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 93be386157
2017-10-20 15:30:30 +00:00
ecfa001cf9
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 2bca12199c
2017-10-20 15:30:13 +00:00
ba670b4126
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 4aa13976be
2017-10-20 15:29:54 +00:00
f7da4a81c6
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 84a268bdaa
2017-10-20 15:29:36 +00:00
44bdd48a48
Import translations. DO NOT MERGE
...
am: d5fa4b82f1
2017-10-20 15:29:16 +00:00
21a3e7ef7a
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:26:11 +00:00
0a366715cd
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:24:32 +00:00
93be386157
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:24:27 +00:00
2bca12199c
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:22:47 +00:00
4aa13976be
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:22:02 +00:00
Colin Cross
Paul Duffin
Xin Li
Bill Yi
TreeHugger Robot
Chih-hung Hsieh