Bill Yi
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
Bill Yi
bfe9042d64
Import translations. DO NOT MERGE am: 7f39ff785e -s ours
...
am: 7659c56784
2017-12-21 17:48:12 +00:00
Bill Yi
ab6d16cf88
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: ce7d21ad2e
2017-12-21 17:47:57 +00:00
Bill Yi
71dabe0eed
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: da3b9b9752
2017-12-21 17:47:41 +00:00
Bill Yi
b5ea28b58a
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 0149f480f6
2017-12-21 17:47:24 +00:00
Bill Yi
0eb4382f34
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 82f6b2d105
2017-12-21 17:47:08 +00:00
Bill Yi
6b7423b2a0
Import translations. DO NOT MERGE
...
am: 5b4b6457d9
2017-12-21 17:46:47 +00:00
Bill Yi
d77d71b7a5
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: e43661faae
2017-12-20 20:38:42 +00:00
Bill Yi
3ab5fd5619
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 86496c0a8e
2017-12-20 20:38:25 +00:00
Bill Yi
e052b904d3
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 1d4e1aadbc
2017-12-20 20:38:09 +00:00
Bill Yi
dd70db430a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: d626e07492
2017-12-20 20:37:53 +00:00
Bill Yi
7659c56784
Import translations. DO NOT MERGE
...
am: 7f39ff785e
2017-12-20 20:37:32 +00:00
TreeHugger Robot
ce7d21ad2e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-12-20 20:21:01 +00:00
TreeHugger Robot
da3b9b9752
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-12-20 20:15:24 +00:00
TreeHugger Robot
0149f480f6
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-12-20 20:14:56 +00:00
TreeHugger Robot
82f6b2d105
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-12-20 20:13:41 +00:00
TreeHugger Robot
e43661faae
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-12-20 20:06:48 +00:00
TreeHugger Robot
86496c0a8e
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-12-20 19:57:45 +00:00
TreeHugger Robot
1d4e1aadbc
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-12-20 19:55:13 +00:00
TreeHugger Robot
d626e07492
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-12-20 19:54:29 +00:00
TreeHugger Robot
beae30c4e8
Merge "Import translations. DO NOT MERGE"
2017-12-20 19:33:57 +00:00
TreeHugger Robot
fd2574bda4
Merge "Import translations. DO NOT MERGE"
2017-12-20 19:22:45 +00:00
Bill Yi
b48a279124
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3d75a28014c36d61c21c48c33eccddc2a753a78d
2017-12-19 18:22:13 -08:00
Bill Yi
5b4b6457d9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I69f3689d113dbb5fdc5bf4b5fe538d24c2aeeb0a
2017-12-19 18:11:43 -08:00
Bill Yi
f435ce79ae
Import translations. DO NOT MERGE
...
Change-Id: I265c7babd1e0f3d6ed7dc9ddf7779f770520cca5
Auto-generated-cl: translation import
2017-12-19 18:01:17 -08:00
Bill Yi
7f39ff785e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If8517d5669dde19ce47805286ebdf9a330960892
2017-12-19 17:48:13 -08:00
Bill Yi
bbf61fc5d6
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I62e324677b8c212ff4b94ccfa46102a8971ad39e
2017-12-19 17:47:37 -08:00
Bill Yi
f9d361dcd8
Import translations. DO NOT MERGE
...
Change-Id: I47cd7bc7be3a009b204ecd509b98577d5a07ee38
Auto-generated-cl: translation import
2017-12-19 17:47:00 -08:00
Bill Yi
2bf06e5c50
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9cd6184f5b9a65b84a46d2bb271b536237fa8f44
2017-12-19 17:43:45 -08:00
Bill Yi
96357bd31e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I23df49c7d77697a168da5c2d1201078582349eab
2017-12-19 17:43:06 -08:00
Bill Yi
880763fb04
Import translations. DO NOT MERGE
...
Change-Id: Id98113aaa443c1107240b4002a35a8d9e1ea129b
Auto-generated-cl: translation import
2017-12-19 17:42:24 -08:00
Bill Yi
c44d798e7e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I109194df374b25260a047bf0e5b3993edfa9275a
2017-12-19 17:40:34 -08:00
Bill Yi
8139573ff0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I4c5f3c11ba98c1ee0dc4ad110ddf8f92eb13ac75
2017-12-19 17:39:26 -08:00
Bill Yi
4798b39caa
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I79026cc9df0e25bc2417dd20eed3031a46a238e8
2017-12-19 17:34:39 -08:00
Bill Yi
87d2226e3b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I118125d24857d4aae99800775c0456ee94c56676
2017-12-19 17:33:50 -08:00
android-build-team Robot
6b06232d85
Snap for 4507345 from 8a45a970ab to pi-release
...
Change-Id: Icdff1f5338ec8bafa5d4c250579427064393d96e
2017-12-17 08:27:13 +00:00
Paul Duffin
8a45a970ab
Add android.test.base/stubs dependency
...
In preparation for the removal of the non-junit classes in the
android.test.base library from the android.jar this adds a dependency
on android.test.base/stubs to ensure this code will continue to
compile.
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
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
LatinIMETests's will need them in order to compile once its classes
are removed from the current SDK on which it currently depends.
Bug: 30188076
Test: make dist
Change-Id: I9f2244d4b5711620dc02dd24dc407807d726480e
2017-12-15 07:22:38 +00:00
android-build-team Robot
97af2749fd
Snap for 4500033 from fc55b74b57 to pi-release
...
Change-Id: Ie2b8ebb29e81e50edb13d9b097acc9c717d0ddd6
2017-12-13 08:22:02 +00:00
Colin Cross
fc55b74b57
Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" am: 87c6fcf126 am: 88f12fdcce
...
am: d373b6c4a5
2017-12-13 01:58:08 +00:00
Colin Cross
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
Colin Cross
88f12fdcce
Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"
...
am: 87c6fcf126
2017-12-13 01:12:43 +00:00
Colin Cross
87c6fcf126
Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"
2017-12-12 23:26:41 +00:00
android-build-team Robot
de63044aa8
Snap for 4496165 from 48011de49f to pi-release
...
Change-Id: I3d8cb53c2792486a498f8dd90e39831d0d73d291
2017-12-11 11:59:24 +00:00
TreeHugger Robot
48011de49f
Merge "Import translations. DO NOT MERGE"
2017-12-08 20:00:11 +00:00
TreeHugger Robot
a97cfc272a
Merge "Import translations. DO NOT MERGE"
2017-12-08 05:29:23 +00:00
Xin Li
913ab6557d
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d8a341b914 -s ours am: 6819b9691a
...
am: 55cf499d38
2017-12-08 04:40:23 +00:00
Bill Yi
3d21834741
Import translations. DO NOT MERGE
...
Change-Id: I1fb69251a612e2f064b418a651e5c679aeb6f528
Auto-generated-cl: translation import
2017-12-07 17:02:42 -08:00
Bill Yi
4d9d9b3224
Import translations. DO NOT MERGE
...
Change-Id: I23bdefa3861b985df5f0cec0cfc84e85df449e58
Auto-generated-cl: translation import
2017-12-07 17:02:31 -08:00
Stephen Li
aa43373fb8
Manually merge changes from giant AOSP topic
...
Change-Id: Ib64f9a5480b83acb2ef855d5c45a7defcdd5be8a
2017-12-07 23:29:32 +00:00
Paul Duffin
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
