Xin Li
99b2349754
[automerger skipped] Skip ab/6749736 in stage. am: 587c17241a
-s ours am: 962c1dd464
-s ours
...
am skip reason: Change-Id Idac165021a2a4835aaefeff5dc4aa9086f91015b with SHA-1 ccfef1083a
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/12797210
Change-Id: I0059462c62170fc5652c8453a0d9349abe996f2f
2020-10-09 02:58:26 +00:00
Xin Li
962c1dd464
[automerger skipped] Skip ab/6749736 in stage. am: 587c17241a
-s ours
...
am skip reason: Change-Id Idac165021a2a4835aaefeff5dc4aa9086f91015b with SHA-1 ccfef1083a
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/12797210
Change-Id: Ia9b9fa1e1983ad307649562d70d79be43c759238
2020-10-09 02:24:18 +00:00
Xin Li
587c17241a
Skip ab/6749736 in stage.
...
Merged-In: Idac165021a2a4835aaefeff5dc4aa9086f91015b
Change-Id: I41711acdaf34010adb53412e3a970cb8cff0add8
2020-10-08 17:23:11 -07:00
Xin Li
b7bacbff96
[automerger skipped] Merge "Merge Android R" am: c65e16db60
-s ours am: 4908f9ae18
-s ours am: e2a6086b5c
-s ours am: 029fc7ffa9
-s ours
...
am skip reason: Change-Id Ia56c511912ee213555b170faf292f1640d90cb75 with SHA-1 98755ccae9
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1422510
Change-Id: Idb95a634a561669ed5e396f499a2d203a8c51f76
2020-09-11 03:58:57 +00:00
Xin Li
029fc7ffa9
[automerger skipped] Merge "Merge Android R" am: c65e16db60
-s ours am: 4908f9ae18
-s ours am: e2a6086b5c
-s ours
...
am skip reason: Change-Id Ia56c511912ee213555b170faf292f1640d90cb75 with SHA-1 98755ccae9
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1422510
Change-Id: I1362f20646ccdb11a15df1eb73947764eba57928
2020-09-11 03:33:27 +00:00
Xin Li
e2a6086b5c
[automerger skipped] Merge "Merge Android R" am: c65e16db60
-s ours am: 4908f9ae18
-s ours
...
am skip reason: Change-Id Ia56c511912ee213555b170faf292f1640d90cb75 with SHA-1 98755ccae9
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1422510
Change-Id: If1dde117b9fc7e6fce93d62f9ee20ff67ccfd1ad
2020-09-11 02:02:36 +00:00
Xin Li
4908f9ae18
[automerger skipped] Merge "Merge Android R" am: c65e16db60
-s ours
...
am skip reason: Change-Id Ia56c511912ee213555b170faf292f1640d90cb75 with SHA-1 98755ccae9
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1422510
Change-Id: Ifb0e8dbe8fe34b47cc18957462003375865382b6
2020-09-11 00:40:02 +00:00
Xin Li
c65e16db60
Merge "Merge Android R"
2020-09-10 17:22:04 +00:00
Xin Li
60be45ecb2
Merge Android R
...
Bug: 168057903
Merged-In: Ia56c511912ee213555b170faf292f1640d90cb75
Change-Id: Id2ed98b896c8f23246df31fead70c94e764aab97
2020-09-08 16:56:16 -07:00
Xin Li
77c76a8286
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 98755ccae9
-s ours am: ded6b22fdc
-s ours am: 89a158c18c
-s ours
...
am skip reason: Change-Id Ic072c06935a52c466d43fe4787cee7c7da73756c with SHA-1 67bb31cfa3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/12470255
Change-Id: I5c93222dee9d33ba60c57324b97c3ef82f0f4b5c
2020-09-01 22:09:54 +00:00
Xin Li
89a158c18c
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 98755ccae9
-s ours am: ded6b22fdc
-s ours
...
am skip reason: Change-Id Ic072c06935a52c466d43fe4787cee7c7da73756c with SHA-1 67bb31cfa3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/12470255
Change-Id: I61c68204b62b3e6dd93e6600900c2a5c1520c857
2020-09-01 21:46:38 +00:00
Xin Li
ded6b22fdc
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 98755ccae9
-s ours
...
am skip reason: Change-Id Ic072c06935a52c466d43fe4787cee7c7da73756c with SHA-1 67bb31cfa3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/12470255
Change-Id: Ic33e106283dedb15e2553222690608f112cdf275
2020-09-01 20:37:02 +00:00
Xin Li
98755ccae9
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: Ic072c06935a52c466d43fe4787cee7c7da73756c
Change-Id: Ia56c511912ee213555b170faf292f1640d90cb75
2020-08-27 10:16:59 -07:00
Adrian Roos
ac34bd401a
Merge "Update LatinIME to comply with Android's inclusive language guidance" am: 33fa7e7126
am: dcf1ecf794
am: 188b10a3a5
am: 86727e6bcb
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188
Change-Id: I42dae9f765e9f3410d89e8d9422205c317a4706a
2020-08-13 11:32:32 +00:00
Adrian Roos
86727e6bcb
Merge "Update LatinIME to comply with Android's inclusive language guidance" am: 33fa7e7126
am: dcf1ecf794
am: 188b10a3a5
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188
Change-Id: I01cb309f71af6a6b6ec0889b4618926722e3b6fa
2020-08-13 11:00:48 +00:00
Adrian Roos
188b10a3a5
Merge "Update LatinIME to comply with Android's inclusive language guidance" am: 33fa7e7126
am: dcf1ecf794
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188
Change-Id: I1b9fe45a2b45645c33c1901b6aaba401a2d439f7
2020-08-13 10:38:27 +00:00
Adrian Roos
dcf1ecf794
Merge "Update LatinIME to comply with Android's inclusive language guidance" am: 33fa7e7126
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188
Change-Id: I1f6a3172d69957c82840635c68820b3aff98f8bf
2020-08-13 10:20:19 +00:00
Adrian Roos
33fa7e7126
Merge "Update LatinIME to comply with Android's inclusive language guidance"
2020-08-13 10:03:51 +00:00
Adrian Roos
444da56414
Update LatinIME to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Bug: 162536543
Change-Id: I5df9e60ec6caa2e1e3253532c2b59b74adfc1749
2020-08-12 13:07:02 +02:00
Treehugger Robot
cfc80fd304
Merge "Update language to comply with Android’s inclusive language guidance" am: b01f678ca8
am: 6fc67acb39
am: 94047a03d9
am: ccfef1083a
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237
Change-Id: I5356f0a29c0a2a0240222dce6d1b4277b0cd22fe
2020-07-31 22:18:26 +00:00
Treehugger Robot
ccfef1083a
Merge "Update language to comply with Android’s inclusive language guidance" am: b01f678ca8
am: 6fc67acb39
am: 94047a03d9
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237
Change-Id: Idac165021a2a4835aaefeff5dc4aa9086f91015b
2020-07-31 21:54:17 +00:00
Treehugger Robot
94047a03d9
Merge "Update language to comply with Android’s inclusive language guidance" am: b01f678ca8
am: 6fc67acb39
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237
Change-Id: Idb33c914d97c7cea11200c96aec716b5f469a190
2020-07-31 21:24:36 +00:00
Treehugger Robot
6fc67acb39
Merge "Update language to comply with Android’s inclusive language guidance" am: b01f678ca8
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237
Change-Id: I5a54bf19ea1ba28abfc4e4451f23bc008749b344
2020-07-31 21:00:45 +00:00
Treehugger Robot
b01f678ca8
Merge "Update language to comply with Android’s inclusive language guidance"
2020-07-31 20:40:28 +00:00
Seigo Nonaka
0c549e7424
Update language to comply with Android’s inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Bug: 161896447
Test: tapas LatinIME && m
Change-Id: Ic06f948c023a091e1532db826a78dd01031d7205
2020-07-31 11:28:59 -07:00
Treehugger Robot
a6c7396edf
Merge "Update language to comply with Android's inclusive language guidance" am: 9490b1b92f
am: 892eabe4c5
am: a2581fb80c
am: 994774ebaf
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602
Change-Id: Ia5f79b6d872cf14ed41627e3027858370a3bfcbe
2020-07-31 18:21:20 +00:00
Treehugger Robot
994774ebaf
Merge "Update language to comply with Android's inclusive language guidance" am: 9490b1b92f
am: 892eabe4c5
am: a2581fb80c
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602
Change-Id: Ia2ead878ea92eeed5048cf2cbfa6c2a80b8c6b20
2020-07-31 18:03:36 +00:00
Treehugger Robot
a2581fb80c
Merge "Update language to comply with Android's inclusive language guidance" am: 9490b1b92f
am: 892eabe4c5
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602
Change-Id: I97c7ce3619bbb6570117d9aad43f18ffa2664059
2020-07-31 17:38:18 +00:00
Treehugger Robot
892eabe4c5
Merge "Update language to comply with Android's inclusive language guidance" am: 9490b1b92f
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602
Change-Id: Ie77533b68469bf4018bffdecda72792fe89aba71
2020-07-31 17:21:34 +00:00
Treehugger Robot
9490b1b92f
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-31 17:05:33 +00:00
Jeff Sharkey
1d9bf42009
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Bug: 161896447
Change-Id: I171bc299e660f96f20041a67a3052bd8a2ed781c
2020-07-31 09:33:35 -06:00
Treehugger Robot
c1a6a00c4f
Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb192212f
am: a2695d0ca6
am: a61e424d0a
am: 9ebba46c77
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236
Change-Id: I685b5e27b3ae1301a94471e11daa64e3b146ade7
2020-07-23 05:25:14 +00:00
Treehugger Robot
9ebba46c77
Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb192212f
am: a2695d0ca6
am: a61e424d0a
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236
Change-Id: I59c0f66bf37497f687d45d7a56e837eecda26c11
2020-07-23 05:08:17 +00:00
Treehugger Robot
a61e424d0a
Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb192212f
am: a2695d0ca6
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236
Change-Id: Id1960131ce017f0a46dffc917d29b171a231472a
2020-07-23 04:45:12 +00:00
Treehugger Robot
a2695d0ca6
Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb192212f
...
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236
Change-Id: Ie132872cad36f2fa2b28eec2be7b4bb148e55d7f
2020-07-23 04:29:32 +00:00
Treehugger Robot
4eb192212f
Merge "Update language to comply with Android’s inclusive language guidance"
2020-07-23 04:05:45 +00:00
Seigo Nonaka
f53e034a17
Update language to comply with Android’s inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Bug: 161896447
Test: tapas LatinIME && m
Change-Id: I2ffb39ff70f61e579b62761d3da526a545dead1f
2020-07-22 14:08:35 -07:00
Treehugger Robot
b586d0f049
Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c
am: daadf71015
am: 67bb31cfa3
am: 99e432986b
...
Change-Id: I048767203dc27b1bad9f488120530ba970cd5f75
2020-04-28 21:53:59 +00:00
Treehugger Robot
99e432986b
Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c
am: daadf71015
am: 67bb31cfa3
...
Change-Id: I662435df33fa3d22d97ac61b0c8c24b5cac05c41
2020-04-28 21:34:27 +00:00
Treehugger Robot
67bb31cfa3
Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c
am: daadf71015
...
Change-Id: Ic072c06935a52c466d43fe4787cee7c7da73756c
2020-04-28 21:20:10 +00:00
Treehugger Robot
daadf71015
Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c
...
Change-Id: I4d86ad8ff2bdaf690c74fff1141542cf9e44a510
2020-04-28 21:00:51 +00:00
Treehugger Robot
fa1093e38c
Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME"
2020-04-28 20:46:01 +00:00
Bob Badour
349a1ce422
Remove MODULE_LICENSE_APACHE2 from LatinIME
...
Repositories containing third-party code need a METADATA and a
license_type. Repositories containing only first-party code no longer
need a MODULE_LICENSE_* file.
Bug: 68860345
Bug: 69058154
Bug: 151953481
Test: no code changes
Change-Id: I1ace00753e03c6c09d63b8c509fde95d44b98739
2020-04-27 19:56:53 -07:00
Treehugger Robot
10b9098292
Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea
am: aab67ba15e
am: e04cfb092e
am: 3b8eaf98ca
...
Change-Id: I4c9319ccd0699e04d088d4e27430a2326b70bcfb
2020-04-15 18:31:42 +00:00
Treehugger Robot
3b8eaf98ca
Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea
am: aab67ba15e
am: e04cfb092e
...
Change-Id: I2db6a95a1e295ea800b29c6018d2badf3138a5cb
2020-04-15 17:57:52 +00:00
Treehugger Robot
e04cfb092e
Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea
am: aab67ba15e
...
Change-Id: I6d376cc2492ed2969c85a72f4456d3711db2f72a
2020-04-15 17:28:09 +00:00
Treehugger Robot
aab67ba15e
Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea
...
Change-Id: Ibc27e9196b7bc9328e465a90c685b9c05460718e
2020-04-15 17:04:32 +00:00
Treehugger Robot
d3af5a28ea
Merge "Add explicit dependencies on jni_headers"
2020-04-15 07:16:51 +00:00
Orion Hodson
54c4f2afb5
Add explicit dependencies on jni_headers
...
Preparation for removing implicit include paths for jni.h from soong.
Bug: 152482542
Test: lunch aosp_x86_64 && m checkbuild
Change-Id: Ib36e679819a3309ccbf12fd592309b16c8bbd6c8
2020-04-13 17:15:59 +01:00
Xin Li
f14a322dab
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2474a95a37
-s ours am: f5345e8d04
am: f92b26967c
...
Change-Id: I41df90830a9b6c288fb124e32fb2a0a85917247b
2020-04-10 04:19:16 +00:00