Commit Graph

40738 Commits (e5852a294393c966347cdf42fd03652e82ba8b94)

Author SHA1 Message Date
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
Bill Yi 7a38b2ca38 Import translations. DO NOT MERGE
Change-Id: I9888f32b8fe115df2509ec58edf97fac514a6984
Auto-generated-cl: translation import
2017-11-26 11:33:43 -08:00
TreeHugger Robot 6020a29d49 Merge "Import translations. DO NOT MERGE" 2017-11-20 22:27:35 +00:00
Bill Yi 714c4d4dbf Import translations. DO NOT MERGE
Change-Id: I2ef7c3c9861f0b171d90c8224f5a9b11550a0482
Auto-generated-cl: translation import
2017-11-20 12:43:12 -08:00
Paul Duffin 097130d198 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
2017-11-16 12:57:31 +00:00
Xin Li 031c250ed2 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: a4843aaec0

Change-Id: I0462847f2e5bed2130ece4c1c729070189fd7849
2017-11-15 02:05:52 +00:00
Xin Li a4843aaec0 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I09ea85c7e1d2723c995b7713ebe2c0cd512c5838
2017-11-14 16:38:24 -08:00
Xin Li e2a1657453 Merge commit 'e6db3dd483747a8f3055c003c706b0c7e7f14db0' into HEAD
Change-Id: I1dc30ae47185eb72a0c0cda05b336c429c20d6de
2017-11-13 14:35:47 -08:00
Bill Yi 99a877b0e2 Import translations. DO NOT MERGE
Change-Id: Id418d38eb98ab8208f06e5c7af1ca796296937dd
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-11-06 23:16:44 -08:00
Chih-hung Hsieh ae75ff8526 Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: a3addf1187 am: f886546409
am: d04a2c6eaf

Change-Id: Id718f12529fba122c4dcef1403e9284c5ba576a8
2017-11-03 00:56:55 +00:00
Chih-hung Hsieh d04a2c6eaf Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: a3addf1187
am: f886546409

Change-Id: I6087998abe17e2e37c9a2f67a27197681db218f3
2017-11-03 00:53:24 +00: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
Bill Yi bd08799b4a Import translations. DO NOT MERGE
Change-Id: Ibbdbe5ae6503c20da9a53d82ee2cb3d68e11a397
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-10-30 17:24:56 -07:00
Chih-hung Hsieh e04f43ca92 Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: f3681fed6d am: 707fd5c3d2
am: 4424dbc80b

Change-Id: If238e8ffc1e7c4f0d7b436fcc568fca4bb098d78
2017-10-30 19:56:45 +00:00
Chih-hung Hsieh 4424dbc80b Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: f3681fed6d
am: 707fd5c3d2

Change-Id: Ie6eb2d7f07c5cc734fe442315ecf57d68512180d
2017-10-30 19:45:38 +00: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
Bill Yi 01e4844599 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 21a3e7ef7a -s ours am: 26fe9fffde -s ours
am: ffa65d4823  -s ours

Change-Id: I96c17177380528b7b56145071aaa9a6050d4409e
2017-10-20 17:46:51 +00:00
Bill Yi ffa65d4823 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 21a3e7ef7a -s ours
am: 26fe9fffde  -s ours

Change-Id: Id187f0e0713127cd572edb95cbc2418d7ccc36d6
2017-10-20 17:16:39 +00:00
Bill Yi 26fe9fffde Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 21a3e7ef7a  -s ours

Change-Id: Ib2495b632cfeccf0b16c9c559738bad81d87b51e
2017-10-20 16:39:22 +00:00
Bill Yi 10b9317d30 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0a366715cd -s ours am: 93774e5a5e -s ours
am: a588e32070  -s ours

Change-Id: Ia3236f778905d26a349a4f751dc2b3786d5a0234
2017-10-20 16:11:05 +00:00
Bill Yi 0de7a9f776 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 93be386157 -s ours am: 086c57be76 -s ours
am: 20fee8e668  -s ours

Change-Id: Iff98c6dc6296053f8866d84aa3aaf9129aa76be6
2017-10-20 16:10:41 +00:00
Bill Yi e18dd22b20 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2bca12199c -s ours am: ecfa001cf9 -s ours
am: 2eb5c28fe1  -s ours

Change-Id: I0595bedfa84f19ad25b50397f56bfa3fce9b1d30
2017-10-20 16:10:22 +00:00
Bill Yi a06c387a50 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4aa13976be -s ours am: ba670b4126 -s ours
am: 878ebba950  -s ours

Change-Id: I093bd44e3a69dc433a934111949660a5bf662d0b
2017-10-20 16:10:03 +00:00
Bill Yi 2ebc801802 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 84a268bdaa -s ours am: f7da4a81c6 -s ours
am: 978c0ec339  -s ours

Change-Id: I3f0b437ba9e0f1f8ef91f22b83c433e493fcb20e
2017-10-20 16:09:46 +00:00
Bill Yi 0c36c055dd Import translations. DO NOT MERGE am: d5fa4b82f1 -s ours am: 44bdd48a48 -s ours
am: 9eab93b1db  -s ours

Change-Id: I27465ae21f3d9b26fb7e162fb9ded58d2d90785d
2017-10-20 16:09:25 +00:00
Bill Yi a588e32070 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0a366715cd -s ours
am: 93774e5a5e  -s ours

Change-Id: Ided9230e788076bbba230308c7ddf06884ad9bba
2017-10-20 15:58:30 +00:00
Bill Yi 20fee8e668 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 93be386157 -s ours
am: 086c57be76  -s ours

Change-Id: Iaeea644ac3c89db1fe04cbfe97899faa52dc2e13
2017-10-20 15:58:12 +00:00
Bill Yi 2eb5c28fe1 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2bca12199c -s ours
am: ecfa001cf9  -s ours

Change-Id: Ic35941aabd21a79290668dd387de4013ddc26ce2
2017-10-20 15:57:54 +00:00
Bill Yi 878ebba950 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4aa13976be -s ours
am: ba670b4126  -s ours

Change-Id: Icf91b0dfecd8a9f62f60b5fe5ad161b5b2e65139
2017-10-20 15:57:37 +00:00
Bill Yi 978c0ec339 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 84a268bdaa -s ours
am: f7da4a81c6  -s ours

Change-Id: I4478ece1620ea9fe3f9b0d632c8374fb3b2addfb
2017-10-20 15:57:19 +00:00
Bill Yi 9eab93b1db Import translations. DO NOT MERGE am: d5fa4b82f1 -s ours
am: 44bdd48a48  -s ours

Change-Id: Idf373b00b7b194647c02b0fd5145464a481d42e3
2017-10-20 15:57:00 +00:00
Bill Yi 93774e5a5e Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0a366715cd  -s ours

Change-Id: I422f7a6911f6f255f7432bf9863100eb87bfd141
2017-10-20 15:30:51 +00:00
Bill Yi 086c57be76 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 93be386157  -s ours

Change-Id: I17b2921206c951c03740283a81ace5e085db0424
2017-10-20 15:30:30 +00:00
Bill Yi ecfa001cf9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 2bca12199c  -s ours

Change-Id: I50b84ae2fa2658a62664985d662a7e45a20f9a4a
2017-10-20 15:30:13 +00:00
Bill Yi ba670b4126 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 4aa13976be  -s ours

Change-Id: Idae772ec400678fa409793940551af634da1be30
2017-10-20 15:29:54 +00:00
Bill Yi f7da4a81c6 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 84a268bdaa  -s ours

Change-Id: I831996fb9b7fe9399d14cfa57c0d551b0e57cee7
2017-10-20 15:29:36 +00:00
Bill Yi 44bdd48a48 Import translations. DO NOT MERGE
am: d5fa4b82f1  -s ours

Change-Id: I795a7ff423686521954e6b27765071368e8b7096
2017-10-20 15:29:16 +00: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