aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am...•••am: 548746a934 -s ours Change-Id: I52fe549e535008030034cd920a571452d7ece80f Bill Yi2018-09-290-0/+0
|\
| * [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev•••am: 8353ab156f -s ours Change-Id: I2abdd1b30fc382712b208d383310833d7fc70c61 Bill Yi2018-09-290-0/+0
| |\
| | * Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-09-291-1/+1
| | |\
| | | * Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ib422a258a32e4a483c7e0713f3aadcaf8de7f512 Bill Yi2018-09-281-1/+1
* | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am...•••am: e3e686492c -s ours Change-Id: Ib142b7a688ece06a24b89658de159db4aa855e7e Bill Yi2018-09-290-0/+0
|\| | |
| * | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev•••am: 8f67a3867c -s ours Change-Id: I44858412e07bf9df60d782ae8c0349f7cdcde4b5 Bill Yi2018-09-290-0/+0
| |\| |
| | * | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-09-292-4/+4
| | |\ \
| | | * | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: If0632d69913ac40f1723faa89272cece8b83f1a0 Bill Yi2018-09-282-4/+4
| | | |/
* | | | [automerger skipped] Import translations. DO NOT MERGE am: 49192ae51d -s ours•••am: 28dd295e7f -s ours Change-Id: Ie22f9db9b8b97dccabb896505fd45ed9ac555741 Bill Yi2018-09-290-0/+0
|\| | |
| * | | [automerger skipped] Import translations. DO NOT MERGE•••am: 49192ae51d -s ours Change-Id: I1ad10be0c21ed2cd3c94d399cfc94e702dda7f02 Bill Yi2018-09-290-0/+0
| |\| |
| | * | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9784cfcb5280e415a04ad109c5ddee33997f7261 Bill Yi2018-09-288-12/+12
| | |/
* | | Import translations. DO NOT MERGE•••Change-Id: I46a499dd1da79f06718cddfd3eafed8123a05967 Auto-generated-cl: translation import Bill Yi2018-09-281-1/+1
* | | Import translations. DO NOT MERGE•••Change-Id: Ib23c52e3e48c46d621a99838f101982d17308d43 Auto-generated-cl: translation import Bill Yi2018-09-261-1/+1
* | | Import translations. DO NOT MERGE•••Change-Id: Ie1e3f7f1f5c270873cecd1b84cffbb2998a09423 Auto-generated-cl: translation import Bill Yi2018-09-211-3/+3
* | | Import translations. DO NOT MERGE•••Change-Id: Ic2ea9113d32f5c0e0a13ab87b0dca6f71ea3dd78 Auto-generated-cl: translation import Bill Yi2018-08-305-9/+9
* | | Merge "Add missing test runner annotations"TreeHugger Robot2018-08-142-2/+8
|\ \ \
| * | | Add missing test runner annotations•••These tests are supposed to run even withotu @RunWith annocation, but for better consistency we should have it there. Bug: 110805255 Test: verified as follows. No new test failures. tapas adb LatinIME LatinIMETests arm64 userdebug && \ DISABLE_PROGUARD=true make -j LatinIME && \ adb install -r $OUT/system/app/LatinIME/LatinIME.apk && \ atest LatinIMETests:com.android.inputmethod.latin.ContactsDictionaryUtilsTest && \ atest LatinIMETests:com.android.inputmethod.latin.ContactsContentObserverTest Change-Id: I5c115d57b2ad41642f5f9b09b0c0d8f8c12480b0 Yohei Yukawa2018-08-132-2/+8
* | | | Merge stage-dr1-aosp-master into stage-aosp-master am: efeceaa60c•••am: 04035c9d20 Change-Id: I6fcf2ecd3f5782bf5d9b30c292aedcdf6d2156dd Xin Li2018-08-130-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge stage-dr1-aosp-master into stage-aosp-master•••am: efeceaa60c Change-Id: I900f02260278cdf2d28b77c57bbebddceeeb7fa7 Xin Li2018-08-130-0/+0
| |\ \ \
| | * \ \ Merge stage-dr1-aosp-master into stage-aosp-master•••Bug: 112535855 Change-Id: Id6a0f71bed88d3d99c7155310c0079677a3473eb Xin Li2018-08-1369-197/+197
| | |\ \ \
* | | \ \ \ Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-08-081-1/+1
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGE•••Change-Id: Ie86b819785a70d5613155360f4551c77b6bf0fd0 Auto-generated-cl: translation import Bill Yi2018-08-071-1/+1
* | | | | | | Merge "Merge Android Pie into master" am: 0b6bd00834 am: d88e3094de am: 0af05...•••am: 43ce76b32d Change-Id: Ibf2725024cb22d93bbd7d26940d5ff045082e932 Xin Li2018-08-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge "Merge Android Pie into master" am: 0b6bd00834 am: d88e3094de•••am: 0af05508c9 Change-Id: Icadf7caebc9cf6313e028de0808fe3832ae99367 Xin Li2018-08-070-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Merge Android Pie into master" am: 0b6bd00834•••am: d88e3094de Change-Id: I7203fce3851ed0fc337bc7698a93965e1f3e9b7a Xin Li2018-08-070-0/+0
| | |\| | |
| | | * | | Merge "Merge Android Pie into master"•••am: 0b6bd00834 Change-Id: I8af512fde2f06c3e5f5b111bef4f77ba97f6873c Xin Li2018-08-070-0/+0
| | | |\ \ \
| | | | * \ \ Merge "Merge Android Pie into master"Xin Li2018-08-0796-283/+6517
| | | | |\ \ \
| | | | | * | | Merge Android Pie into master•••Bug: 112104996 Change-Id: I80533e40e18491cbd2973f76b0712f5c7adf45e4 Xin Li2018-08-0696-283/+6517
| | | | |/| | | | | | | |/ / / | | | |/| | |
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 207db93a85 -s ours Change-Id: I3afe89c6079c385c448719a4311aabdfb95fe40c Bill Yi2018-08-040-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: bab98e72ad -s ours Change-Id: I5921c0032b6d3d28745cbb7e0c2ddf54a13232ef Bill Yi2018-08-040-0/+0
| |\| | | | |
| | * | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 7fee2eab02 -s ours Change-Id: I114ae3091f30c50cc58b19e2e7e08c7d1d80bc75 Bill Yi2018-08-040-0/+0
| | |\| | | |
| | | * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2018-08-0515-39/+39
| | | |\ \ \ \
| | | | * | | | Import translations. DO NOT MERGE•••Change-Id: I8892576a36ac7ad3f113db815bfa5d85d3272f6f Auto-generated-cl: translation import Bill Yi2018-08-0415-39/+39
* | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: ba6a80589e -s ours Change-Id: I66351f0e9c652b38533dd1dbbac4d22718fdc527 Bill Yi2018-08-040-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 205a2f40ba -s ours Change-Id: Id001f3991859b1657cedce9f71257730340371a5 Bill Yi2018-08-040-0/+0
| |\| | | | | |
| | * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 9a9aec3313 -s ours Change-Id: I1026d014d40831597ca14d94063c0cbabfb3a6e7 Bill Yi2018-08-040-0/+0
| | |\| | | | |
| | | * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2018-08-051-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Import translations. DO NOT MERGE•••Change-Id: I0b1ba5a559b21086273b6aeb51a4594fd103f581 Auto-generated-cl: translation import Bill Yi2018-08-041-1/+1
| | | | |/ / / /
* | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: b1a318dbdd -s ours Change-Id: I98272b493f1c0a25aa362971f567ccea547445f8 Bill Yi2018-08-040-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 5b294cccf9 -s ours Change-Id: Ifc27631ac1ecfd7c86ecc18bab8e2cb207682351 Bill Yi2018-08-040-0/+0
| |\| | | | | |
| | * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: c74fcad61b -s ours Change-Id: I9d29babbf47cea1bfa32aafdb5dc77b5d5eda42e Bill Yi2018-08-040-0/+0
| | |\| | | | |
| | | * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2018-08-051-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Import translations. DO NOT MERGE•••Change-Id: I72cb33f43c33497c1f022aee66c7b87cc46af6a8 Auto-generated-cl: translation import Bill Yi2018-08-041-1/+1
| | | | |/ / / /
* | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 845a8eeb0f -s ours Change-Id: I0ddb5004116a72c1993d25e7f41a0ba98af5550d Bill Yi2018-08-040-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 5511368d7e -s ours Change-Id: I0531e3400725a9a2eb73fb498d272ff0120c6cb5 Bill Yi2018-08-040-0/+0
| |\| | | | | |
| | * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 957b4da1b0 -s ours Change-Id: I52af21d975efe813b557f52e4646d7af629fe8c6 Bill Yi2018-08-040-0/+0
| | |\| | | | |
| | | * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2018-08-052-2/+2
| | | |\ \ \ \ \
| | | | * | | | | Import translations. DO NOT MERGE•••Change-Id: Id73e068efeb13735eca3fd8009100ea4323e4129 Auto-generated-cl: translation import Bill Yi2018-08-042-2/+2
| | | | |/ / / /
* | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 95047f1460 -s ours Change-Id: Iab9c68ed867d1d15d02b444e50b5ed9dd7044827 Bill Yi2018-08-040-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aos...•••am: 50ae03af3f -s ours Change-Id: I0bbeaa7ff12db5ffa176811d2d27e9c6f8d2fc67 Bill Yi2018-08-040-0/+0
| |\| | | | | |