aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [automerger skipped] Skip ab/6749736 in stage. am: 587c17241a -s ours am: ↵Xin Li2020-10-090-0/+0
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | [automerger skipped] Skip ab/6749736 in stage. am: 587c17241a -s oursXin Li2020-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | Merged-In: Idac165021a2a4835aaefeff5dc4aa9086f91015b Change-Id: I41711acdaf34010adb53412e3a970cb8cff0add8
* | | | | [automerger skipped] Merge "Merge Android R" am: c65e16db60 -s ours am: ↵Xin Li2020-09-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4908f9ae18 -s ours am: e2a6086b5c -s ours am: 029fc7ffa9 -s ours am: b7bacbff96 -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: I80987dd2969a339472f121577cca18646639599a
| * | | | [automerger skipped] Merge "Merge Android R" am: c65e16db60 -s ours am: ↵Xin Li2020-09-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | [automerger skipped] Merge "Merge Android R" am: c65e16db60 -s ours am: ↵Xin Li2020-09-110-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | [automerger skipped] Merge "Merge Android R" am: c65e16db60 -s ours am: ↵Xin Li2020-09-110-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | [automerger skipped] Merge "Merge Android R" am: c65e16db60 -s oursXin Li2020-09-110-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * \ Merge "Merge Android R"Xin Li2020-09-10580-153463/+153861
| | | | | |\ \
| | | | | | * | Merge Android RXin Li2020-09-08580-153463/+153861
| | | | | |/| | | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 168057903 Merged-In: Ia56c511912ee213555b170faf292f1640d90cb75 Change-Id: Id2ed98b896c8f23246df31fead70c94e764aab97
* | | | | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (rvc-dev-plus-aosp-without-vendor@6692709) am: 98755ccae9 -s ours am: ded6b22fdc -s ours am: 89a158c18c -s ours am: 77c76a8286 -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: Ifba4a260cbfe0c762b6c6629b9649054c2393c50
| * | | | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
| | * | | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
| | | * | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-010-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
| | | | * | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-27580-153463/+153861
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 166295507 Merged-In: Ic072c06935a52c466d43fe4787cee7c7da73756c Change-Id: Ia56c511912ee213555b170faf292f1640d90cb75
* | | | | | | Merge "Update LatinIME to comply with Android's inclusive language guidance" ↵Adrian Roos2020-08-132-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 33fa7e7126 am: dcf1ecf794 am: 188b10a3a5 am: 86727e6bcb am: ac34bd401a Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188 Change-Id: Ifb6f1c248eebb8333251ebaaca34f428d97fced8
| * | | | | | Merge "Update LatinIME to comply with Android's inclusive language guidance" ↵Adrian Roos2020-08-132-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 33fa7e7126 am: dcf1ecf794 am: 188b10a3a5 am: 86727e6bcb Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188 Change-Id: I42dae9f765e9f3410d89e8d9422205c317a4706a
| | * | | | | Merge "Update LatinIME to comply with Android's inclusive language guidance" ↵Adrian Roos2020-08-132-3/+3
| | |\| | | | | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 33fa7e7126 am: dcf1ecf794 am: 188b10a3a5 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188 Change-Id: I01cb309f71af6a6b6ec0889b4618926722e3b6fa
| | | * | | Merge "Update LatinIME to comply with Android's inclusive language guidance" ↵Adrian Roos2020-08-132-3/+3
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 33fa7e7126 am: dcf1ecf794 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188 Change-Id: I1b9fe45a2b45645c33c1901b6aaba401a2d439f7
| | | | * | Merge "Update LatinIME to comply with Android's inclusive language guidance" ↵Adrian Roos2020-08-132-3/+3
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 33fa7e7126 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188 Change-Id: I1f6a3172d69957c82840635c68820b3aff98f8bf
| | | | | * \ Merge "Update LatinIME to comply with Android's inclusive language guidance"Adrian Roos2020-08-132-3/+3
| | | | | |\ \
| | | | | | * | Update LatinIME to comply with Android's inclusive language guidanceAdrian Roos2020-08-122-3/+3
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://source.android.com/setup/contribute/respectful-code for reference Bug: 162536543 Change-Id: I5df9e60ec6caa2e1e3253532c2b59b74adfc1749
* | | | | | | Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot2020-07-316-23/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidance" am: b01f678ca8 am: 6fc67acb39 am: 94047a03d9 am: ccfef1083a am: cfc80fd304 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237 Change-Id: If182d384b22db7295e622b056576f0b9fba580e5
| * | | | | | Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot2020-07-316-23/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot2020-07-316-23/+25
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidance" am: b01f678ca8 am: 6fc67acb39 am: 94047a03d9 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237 Change-Id: Idac165021a2a4835aaefeff5dc4aa9086f91015b
| | | * | | | Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot2020-07-316-23/+25
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidance" am: b01f678ca8 am: 6fc67acb39 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237 Change-Id: Idb33c914d97c7cea11200c96aec716b5f469a190
| | | | * | | Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot2020-07-316-23/+25
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidance" am: b01f678ca8 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237 Change-Id: I5a54bf19ea1ba28abfc4e4451f23bc008749b344
| | | | | * | Merge "Update language to comply with Android’s inclusive language guidance"Treehugger Robot2020-07-316-23/+25
| | | | | |\ \
| | | | | | * | Update language to comply with Android’s inclusive language guidanceSeigo Nonaka2020-07-316-23/+25
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: tapas LatinIME && m Change-Id: Ic06f948c023a091e1532db826a78dd01031d7205
* | | | | | | Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot2020-07-3121-24/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9490b1b92f am: 892eabe4c5 am: a2581fb80c am: 994774ebaf am: a6c7396edf Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602 Change-Id: Ic4c551578824440d04880125d568a760cf01831f
| * | | | | | Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot2020-07-3121-24/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9490b1b92f am: 892eabe4c5 am: a2581fb80c am: 994774ebaf Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602 Change-Id: Ia5f79b6d872cf14ed41627e3027858370a3bfcbe
| | * | | | | Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot2020-07-3121-24/+24
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9490b1b92f am: 892eabe4c5 am: a2581fb80c Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602 Change-Id: Ia2ead878ea92eeed5048cf2cbfa6c2a80b8c6b20
| | | * | | | Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot2020-07-3121-24/+24
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9490b1b92f am: 892eabe4c5 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602 Change-Id: I97c7ce3619bbb6570117d9aad43f18ffa2664059
| | | | * | | Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot2020-07-3121-24/+24
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9490b1b92f Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602 Change-Id: Ie77533b68469bf4018bffdecda72792fe89aba71
| | | | | * | Merge "Update language to comply with Android's inclusive language guidance"Treehugger Robot2020-07-3121-24/+24
| | | | | |\ \
| | | | | | * | Update language to comply with Android's inclusive language guidanceJeff Sharkey2020-07-3121-24/+24
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Change-Id: I171bc299e660f96f20041a67a3052bd8a2ed781c
* | | | | | | Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot2020-07-2315-33/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidance" am: 4eb192212f am: a2695d0ca6 am: a61e424d0a am: 9ebba46c77 am: c1a6a00c4f Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236 Change-Id: I0396c4ac21799fd4bc1213207d60a2c4c5996364
| * | | | | | Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot2020-07-2315-33/+33
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot2020-07-2315-33/+33
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidance" am: 4eb192212f am: a2695d0ca6 am: a61e424d0a Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236 Change-Id: I59c0f66bf37497f687d45d7a56e837eecda26c11
| | | * | | | Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot2020-07-2315-33/+33
| | | |\| | | | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidance" am: 4eb192212f am: a2695d0ca6 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236 Change-Id: Id1960131ce017f0a46dffc917d29b171a231472a
| | | | * | Merge "Update language to comply with Android’s inclusive language ↵Treehugger Robot2020-07-2315-33/+33
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidance" am: 4eb192212f Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236 Change-Id: Ie132872cad36f2fa2b28eec2be7b4bb148e55d7f
| | | | | * Merge "Update language to comply with Android’s inclusive language guidance"Treehugger Robot2020-07-2315-33/+33
| | | | |/|
| | | | | * Update language to comply with Android’s inclusive language guidanceSeigo Nonaka2020-07-2215-33/+33
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: tapas LatinIME && m Change-Id: I2ffb39ff70f61e579b62761d3da526a545dead1f
* | | | | Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c am: ↵Treehugger Robot2020-04-281-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | daadf71015 am: 67bb31cfa3 am: 99e432986b am: b586d0f049 Change-Id: I0336b0d7115803a60a0f636d6a251a7acd66e409
| * | | | Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c am: ↵Treehugger Robot2020-04-281-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | daadf71015 am: 67bb31cfa3 am: 99e432986b Change-Id: I048767203dc27b1bad9f488120530ba970cd5f75
| | * | | Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c am: ↵Treehugger Robot2020-04-281-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | daadf71015 am: 67bb31cfa3 Change-Id: I662435df33fa3d22d97ac61b0c8c24b5cac05c41
| | | * | Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c am: ↵Treehugger Robot2020-04-281-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | daadf71015 Change-Id: Ic072c06935a52c466d43fe4787cee7c7da73756c
| | | | * Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38cTreehugger Robot2020-04-281-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I4d86ad8ff2bdaf690c74fff1141542cf9e44a510
| | | | | * Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME"Treehugger Robot2020-04-281-0/+0
| | | | | |\
| | | | | | * Remove MODULE_LICENSE_APACHE2 from LatinIMEBob Badour2020-04-271-0/+0
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-01 18:43:46 +0000