3ae1830916
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86496c0a8e -s ours
...
am: 3ab5fd5619
2017-12-21 17:48:57 +00:00
dcea1090b0
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1d4e1aadbc -s ours
...
am: e052b904d3
2017-12-21 17:48:42 +00:00
935ce8d1b8
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d626e07492 -s ours
...
am: dd70db430a
2017-12-21 17:48:27 +00:00
bfe9042d64
Import translations. DO NOT MERGE am: 7f39ff785e -s ours
...
am: 7659c56784
2017-12-21 17:48:12 +00:00
ab6d16cf88
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: ce7d21ad2e
2017-12-21 17:47:57 +00:00
71dabe0eed
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: da3b9b9752
2017-12-21 17:47:41 +00:00
b5ea28b58a
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 0149f480f6
2017-12-21 17:47:24 +00:00
0eb4382f34
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 82f6b2d105
2017-12-21 17:47:08 +00:00
6b7423b2a0
Import translations. DO NOT MERGE
...
am: 5b4b6457d9
2017-12-21 17:46:47 +00:00
3ab5fd5619
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 86496c0a8e
2017-12-20 20:38:25 +00:00
e052b904d3
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 1d4e1aadbc
2017-12-20 20:38:09 +00:00
dd70db430a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: d626e07492
2017-12-20 20:37:53 +00:00
7659c56784
Import translations. DO NOT MERGE
...
am: 7f39ff785e
2017-12-20 20:37:32 +00:00
ce7d21ad2e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-12-20 20:21:01 +00:00
da3b9b9752
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-12-20 20:15:24 +00:00
0149f480f6
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-12-20 20:14:56 +00:00
82f6b2d105
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-12-20 20:13:41 +00:00
86496c0a8e
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-12-20 19:57:45 +00:00
1d4e1aadbc
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-12-20 19:55:13 +00:00
d626e07492
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-12-20 19:54:29 +00:00
b48a279124
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3d75a28014c36d61c21c48c33eccddc2a753a78d
2017-12-19 18:22:13 -08:00
5b4b6457d9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I69f3689d113dbb5fdc5bf4b5fe538d24c2aeeb0a
2017-12-19 18:11:43 -08:00
7f39ff785e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If8517d5669dde19ce47805286ebdf9a330960892
2017-12-19 17:48:13 -08:00
bbf61fc5d6
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I62e324677b8c212ff4b94ccfa46102a8971ad39e
2017-12-19 17:47:37 -08:00
2bf06e5c50
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9cd6184f5b9a65b84a46d2bb271b536237fa8f44
2017-12-19 17:43:45 -08:00
96357bd31e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I23df49c7d77697a168da5c2d1201078582349eab
2017-12-19 17:43:06 -08:00
c44d798e7e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I109194df374b25260a047bf0e5b3993edfa9275a
2017-12-19 17:40:34 -08:00
8139573ff0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I4c5f3c11ba98c1ee0dc4ad110ddf8f92eb13ac75
2017-12-19 17:39:26 -08:00
87d2226e3b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I118125d24857d4aae99800775c0456ee94c56676
2017-12-19 17:33:50 -08:00
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
Bill Yi
TreeHugger Robot
Colin Cross
Paul Duffin
Xin Li