aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | 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
* | | | | | Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: ↵Treehugger Robot2020-04-152-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aab67ba15e am: e04cfb092e am: 3b8eaf98ca am: 10b9098292 Change-Id: I94f97e234e8d72f2b164d72bc33fa2da758a8d61
| * | | | | Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: ↵Treehugger Robot2020-04-152-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aab67ba15e am: e04cfb092e am: 3b8eaf98ca Change-Id: I4c9319ccd0699e04d088d4e27430a2326b70bcfb
| | * | | | Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: ↵Treehugger Robot2020-04-152-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aab67ba15e am: e04cfb092e Change-Id: I2db6a95a1e295ea800b29c6018d2badf3138a5cb
| | | * | | Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: aab67ba15eTreehugger Robot2020-04-152-0/+3
| | | |\| | | | | | | | | | | | | | | | | | | | Change-Id: I6d376cc2492ed2969c85a72f4456d3711db2f72a
| | | | * | Merge "Add explicit dependencies on jni_headers" am: d3af5a28eaTreehugger Robot2020-04-152-0/+3
| | | | |\| | | | | | | | | | | | | | | | | | | Change-Id: Ibc27e9196b7bc9328e465a90c685b9c05460718e
| | | | | * Merge "Add explicit dependencies on jni_headers"Treehugger Robot2020-04-152-0/+3
| | | | | |\
| | | | | | * Add explicit dependencies on jni_headersOrion Hodson2020-04-132-0/+3
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preparation for removing implicit include paths for jni.h from soong. Bug: 152482542 Test: lunch aosp_x86_64 && m checkbuild Change-Id: Ib36e679819a3309ccbf12fd592309b16c8bbd6c8
* | | | | | [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 am: f14a322dab -s ours am skip reason: subject contains skip directive Change-Id: I48f876015329693b8b0b81606ae57466ea45ef3c
| * | | | | [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
| | * | | | [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
| | | * | | [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
| | | | * | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: I75ad17500f91c05f799d8d60cd235eaddec994df
| | | | | * \ Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94Treehugger Robot2020-03-312-116/+122
| | | | | |\ \ | | | | | |/ / | | | | |/| | | | | | | | | Change-Id: I7fbeebe78d5160bd6cb9af13bfe76272bf3c7133
* | | | | | | Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94 am: ↵Treehugger Robot2020-03-312-116/+122
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0428fa5453 am: 7bc73dd05d am: 524759aa51 Change-Id: Ib9cf1a96282c53a7b326f102f7f296a2629c2eb9
| * | | | | | Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94 am: ↵Treehugger Robot2020-03-312-116/+122
|/| | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | 0428fa5453 am: 7bc73dd05d Change-Id: I546d11a65d5a69f64275d7a4ff37ba5b6a708c88
| * / / / / Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94 am: ↵Treehugger Robot2020-03-312-116/+122
|/| | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | 0428fa5453 Change-Id: I2b7721b759febb75ea9731e57cb48b54f95fec64
| * / / / Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94Treehugger Robot2020-03-312-116/+122
|/| | | | | |/ / / | | | | | | | | Change-Id: Ia32701aa3b3b6b6eb0f87df614ed68ba75d1d385
| * | | Merge "Add an exported flag in manifest" am: 2e60c56ea9Treehugger Robot2020-03-312-116/+122
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I3fbd69e4f9e5b38c108335bdfc8b83d7a998fd65