Commit Graph

40372 Commits (87c6fcf126672e1b8ea8b3a4581f96845537bcae)

Author SHA1 Message Date
Colin Cross 87c6fcf126 Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" 2017-12-12 23:26:41 +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
Xin Li d8a341b914 Merge "DO NOT MERGE: Merge Oreo MR1 into master" 2017-12-06 23:18:26 +00:00
Xin Li 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
TreeHugger Robot f99e090a59 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-11-30 01:30:16 +00:00
TreeHugger Robot b6355a66f7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-11-30 01:30:00 +00:00
TreeHugger Robot b9d6be45b3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-11-30 01:26:34 +00:00
Bill Yi 83cce9a2c6 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I27a8a609dbedec443ec0efcb5a9624a30109a2dd
2017-11-29 15:24:23 -08:00
Bill Yi c34ef720ca Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I24694255d2be60a04d11630f1f738b8e84eaeaa0
2017-11-29 15:14:33 -08:00
Bill Yi 507946daee Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I04fb48059e4b43c0093ff661dc15f7471f58821b
2017-11-29 15:12:28 -08:00
Bill Yi 39973180c7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I0303d0946be41a5bea10906e4c83de2288720df0
2017-11-29 15:10:28 -08:00
Xin Li e2a1657453 Merge commit 'e6db3dd483747a8f3055c003c706b0c7e7f14db0' into HEAD
Change-Id: I1dc30ae47185eb72a0c0cda05b336c429c20d6de
2017-11-13 14:35:47 -08:00
Chih-hung Hsieh f886546409 Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni"
am: a3addf1187

Change-Id: I92e0317804176a295c079aa81e7b01fc03a852d9
2017-11-03 00:51:12 +00:00
Chih-hung Hsieh a3addf1187 Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" 2017-11-03 00:47:18 +00:00
Chih-Hung Hsieh 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
Chih-hung Hsieh 707fd5c3d2 Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni"
am: f3681fed6d

Change-Id: Ib83bfbc92d482f4b242255200da1311a00141cd6
2017-10-30 19:40:45 +00:00
Chih-hung Hsieh f3681fed6d Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" 2017-10-30 19:26:28 +00:00
Chih-Hung Hsieh 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
TreeHugger Robot 21a3e7ef7a Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-10-20 15:26:11 +00:00
TreeHugger Robot 0a366715cd Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-10-20 15:24:32 +00:00
TreeHugger Robot 93be386157 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-10-20 15:24:27 +00:00
TreeHugger Robot 2bca12199c Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-10-20 15:22:47 +00:00
TreeHugger Robot 4aa13976be Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-10-20 15:22:02 +00:00
TreeHugger Robot 84a268bdaa Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-10-20 15:21:35 +00:00
Bill Yi 219a4ea071 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I49a204ed91926d35cb0ab45159e103a1716489a1
2017-10-20 04:03:40 -07:00
Bill Yi b59f941980 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I782f9c874cee4502ec56c3c6158dcda4cedddcb1
2017-10-20 03:53:10 -07:00
Bill Yi 32b913902b Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Ie327a07f5377952aa2a20cb16c686c8f50f3f792
2017-10-20 03:50:04 -07:00
Bill Yi f09fb6d322 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Iaabf04eb63eb41d2e895cdc011a540bf48de95ee
2017-10-20 03:48:10 -07:00
Bill Yi 4809cb6fab Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I3ac35f1a243185d7c10eafc64428927dbc95ebe3
2017-10-20 03:44:41 -07:00
Bill Yi 6f50a4c0bc Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Ic7198eb249a6745a8e4a1c4517ce6f2805950383
2017-10-20 03:43:09 -07:00
Bill Yi d5fa4b82f1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I0b9604ade68baf6adc5a0ce7aaf9351aaeead8ec
2017-10-20 03:41:10 -07:00
Bill Yi e6db3dd483 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8d1c17d2ad -s ours
am: 3f1c7d72eb  -s ours

Change-Id: Ibee94f0dd88a4b7873b8347def073b8459613e4d
2017-10-17 05:42:48 +00:00
Bill Yi 17fa9e4313 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d05359f2d0 -s ours
am: 3d854360a5  -s ours

Change-Id: I2e9909524a6e3e7169aba6d85832fac9a501a7b6
2017-10-17 05:42:29 +00:00
Bill Yi aebeafdcc8 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 04a65d2e70 -s ours
am: e9d8b2b5f4  -s ours

Change-Id: I2c9abf1eaaf87f549b9a89e15720b0c1d3a3bc6f
2017-10-17 05:42:10 +00:00
Bill Yi 0698939158 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fab6fa3164 -s ours
am: 8d7b081cda  -s ours

Change-Id: I308208840e7ea8c01c9b05da68a546681c98598a
2017-10-17 05:41:45 +00:00
Bill Yi 2d84ecb4d4 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8f8d12fd45 -s ours
am: b8f6b581d8  -s ours

Change-Id: I0dbca369aeac5d132656110edb60e76b8ef016bc
2017-10-17 05:41:23 +00:00
Bill Yi 5c07835325 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 478cac680f -s ours
am: 0bf9837bba  -s ours

Change-Id: I36029ea700200f46bfc0f0dbca326501ab05770f
2017-10-17 05:41:03 +00:00
Bill Yi 8653b292b1 Import translations. DO NOT MERGE am: ff4edea1aa -s ours
am: e897e1f74e  -s ours

Change-Id: Ida486e946fb171fa414337d1d13f4100e692488a
2017-10-17 05:40:43 +00:00
Bill Yi d00e82f3a1 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8d1c17d2ad -s ours
am: fde28ca6e5  -s ours

Change-Id: Ice5d70132507e8f1055bbbe365eee98a36f2bad4
2017-10-17 03:39:29 +00:00
Bill Yi 1b9f70130d Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d05359f2d0 -s ours
am: d1455e9849  -s ours

Change-Id: Ibfcd5aee42d3af31558dfeac20ea3f3f14c0c3e9
2017-10-17 03:39:10 +00:00
Bill Yi 301dab45e0 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 04a65d2e70 -s ours
am: c2993798ed  -s ours

Change-Id: I2d6f2ab789110ed372c855f02e88d446f69a29bd
2017-10-17 03:38:51 +00:00
Bill Yi 9b97da5631 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fab6fa3164 -s ours
am: 26b10fc03e  -s ours

Change-Id: Ia55477d58f8decb08faf38e6cbaeaccd8e82cef6
2017-10-17 03:38:32 +00:00
Bill Yi c89e8680ac Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8f8d12fd45 -s ours
am: 1ffb847b90  -s ours

Change-Id: I70974b5d3264f9898bab8001999a08ca738456c6
2017-10-17 03:38:10 +00:00
Bill Yi 8366173e76 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 478cac680f -s ours
am: a9cbb6a01b  -s ours

Change-Id: I8f6e2dc48d45656e8a1af9f9651e9d82f1940ba7
2017-10-17 03:37:50 +00:00
Bill Yi 646984936c Import translations. DO NOT MERGE am: ff4edea1aa -s ours
am: 2c47ce5160  -s ours

Change-Id: Id47954972d932636a932838685fb448975ee82a6
2017-10-17 03:37:30 +00:00
Bill Yi 52b98ecfbf Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: dae72841f2  -s ours

Change-Id: If197069957022ed634695b36d34bc348e91d5178
2017-10-17 03:37:13 +00:00
Bill Yi 54f341b978 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: e369c37a0f  -s ours

Change-Id: I10d71ed188c760c540a30ea7da3f645627eb1764
2017-10-17 03:36:55 +00:00
Bill Yi a7a0fb487c Import translations. DO NOT MERGE
am: a7a34608d0  -s ours

Change-Id: I857dddad7e38dd313ab4990bc0b6c3e889221563
2017-10-17 03:36:37 +00:00
Bill Yi fde28ca6e5 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 8d1c17d2ad  -s ours

Change-Id: I8e98fdb1fe91dbec73bbc11702e7a37ebe989001
2017-10-17 02:22:29 +00:00
Bill Yi d1455e9849 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: d05359f2d0  -s ours

Change-Id: Ic7273eacff5b1a24b1cf309799155c816a3ed6d7
2017-10-17 02:22:09 +00:00