aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken liblatinime_unittestsAdrian Roos2021-02-161-3/+9
| | | | | | Change-Id: I95021965ecc2699fbce01ed0552dd28fed7f8fe4 Merged-In: I95021965ecc2699fbce01ed0552dd28fed7f8fe4 Fixes: 180014759 Test: atest liblatinime_unittests --host
* Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
|\ | | | | | | | | Bug: 172690556 Change-Id: If9cf64206ba6c851ac2d72a5682a5481b25f4764
| * [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 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 "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 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 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 ↵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 "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c am: ↵Treehugger Robot2020-04-281-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daadf71015 am: 67bb31cfa3 am: 99e432986b Change-Id: I048767203dc27b1bad9f488120530ba970cd5f75
| * \ \ \ \ \ \ \ \ Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: ↵Treehugger Robot2020-04-152-0/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aab67ba15e am: e04cfb092e am: 3b8eaf98ca Change-Id: I4c9319ccd0699e04d088d4e27430a2326b70bcfb
| * \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 2474a95a37 -s ours am: f5345e8d04 am: f92b26967c Change-Id: I41df90830a9b6c288fb124e32fb2a0a85917247b
| * \ \ \ \ \ \ \ \ \ \ Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94 am: ↵Treehugger Robot2020-03-312-116/+122
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0428fa5453 am: 7bc73dd05d Change-Id: I546d11a65d5a69f64275d7a4ff37ba5b6a708c88
* | \ \ \ \ \ \ \ \ \ \ \ Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Merged-In: Idac165021a2a4835aaefeff5dc4aa9086f91015b Change-Id: I41711acdaf34010adb53412e3a970cb8cff0add8
| * | | | | | | | | | | 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 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 ↵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 "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c am: ↵Treehugger Robot2020-04-281-0/+0
| |\| | | | | | | | | | | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daadf71015 am: 67bb31cfa3 Change-Id: I662435df33fa3d22d97ac61b0c8c24b5cac05c41
| * | | | | | | | | | Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: ↵Treehugger Robot2020-04-152-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aab67ba15e am: e04cfb092e Change-Id: I2db6a95a1e295ea800b29c6018d2badf3138a5cb
| * | | | | | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 2474a95a37 -s ours am: f5345e8d04 Change-Id: Icc05b2971ccb3b999399018c8ee220ec2b5d5a36
| * | | | | | | | | | Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94 am: ↵Treehugger Robot2020-03-312-116/+122
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0428fa5453 Change-Id: I2b7721b759febb75ea9731e57cb48b54f95fec64
* | | | | | | | | | | [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
* | | | | | | | | | 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 "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e38c am: ↵Treehugger Robot2020-04-281-0/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daadf71015 Change-Id: Ic072c06935a52c466d43fe4787cee7c7da73756c
| * | | | | | | | Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: aab67ba15eTreehugger Robot2020-04-152-0/+3
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: I6d376cc2492ed2969c85a72f4456d3711db2f72a
| * | | | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 2474a95a37 -s ours am skip reason: subject contains skip directive Change-Id: I7bb35d14fbd3e03bfa2b268d69bb63394644994a
| * | | | | | | | Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94Treehugger Robot2020-03-312-116/+122
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: Ia32701aa3b3b6b6eb0f87df614ed68ba75d1d385
| * | | | | | | | Merge "Implement text entry key API for accessibility services in AOSP ↵Automerger Merge Worker2019-12-043-16/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keyboard" am: c3eafcb756 am: fc2bc10530 Change-Id: Ie3e94bbd0401ddabb489b0bcf6e7f6fc6be8f0c0
| * \ \ \ \ \ \ \ \ Merge "Merge Android10 QPR1 into AOSP master" am: e5aad47755 am: ddcf093505Automerger Merge Worker2019-12-040-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If73065e6effd5fc16c213d3dca4b97ff7f143edb
| * \ \ \ \ \ \ \ \ \ Merge "Support polytonic Greek diacritics in the Greek keyboard" am: ↵Alex Henrie2019-11-253-27/+199
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f64e2769b7 am: fa276af7df am: 9b45f98e23 Change-Id: I9e2f744204ceae36d092d2b95526e5c956f7c14f
| * \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-11-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee2e651ebfd028b235b428939964b1b532427e78 Auto-generated-cl: translation import
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-11-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-11-101-1/+1
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f46ed0024412fbf2b1e5d549ac4f5747ba10ead Auto-generated-cl: translation import
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-11-102-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-11-102-6/+6
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2688babc5d396ae65481a97b186e52c7c3dafbc9 Auto-generated-cl: translation import
| * / / / / / / / / / / / Import translations. DO NOT MERGEBill Yi2019-11-101-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I237d2997fb1314302be85530c6b6bc710426b36b Auto-generated-cl: translation import
| * | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-11-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev am: 891e9bad07 -s ours am: c98755cd39 -s ours am skip reason: subject contains skip directive Change-Id: Ic76c0f069dbd44bf5ba6c1299d34809e0f4a062f
| * \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-11-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev am: a047102265 -s ours am: fb337911b8 -s ours am skip reason: subject contains skip directive Change-Id: I609844af08d5ea60d781c88486217aff17c997ba
| * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-11-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev am: a9761dd09f -s ours am: ed4461afd4 -s ours am skip reason: subject contains skip directive Change-Id: I6a1d8965ea9f181c7b014dead2472ca07548acbd
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-01 23:18:55 +0000