aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-05-071-1/+1
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2018-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Idcaaccff8ab717edfc84ed27e30b9b0a3288ba10
* | | | | [automerger skipped] Import translations. DO NOT MERGE am: 7a51bb5a4f -s oursBill Yi2018-05-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a9e343721c -s ours Change-Id: I6f1ffc1e73dbfde0b13a0917a16a82d4efa06a70
| * | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-05-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7a51bb5a4f -s ours Change-Id: I7ef3f02d52d77ad75ae1a315f4a5a48737a1da7a
| | * | | Import translations. DO NOT MERGEBill Yi2018-05-032-3/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I8dd583f9628d0e0caa5a45cc646688f1fbc2ea08
* | | | Merge java-overridable/ into java/ againYohei Yukawa2018-05-0621-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL a logical revert of a previous CL [1], which separated Java files into common ones and overridable ones. Now that that overriding concept is no longer used, there is no need to keep having separate directory structure. [1]: Ic734bd4d20aa050c688a3158b1a382ae0ac18991 fb74ab15c1343084740d65ef8744cad33a678e82 Fix: 79323502 Test: make -j aosp_taimen-userdebug && make -j Test: tapas LatinIME && make -j Change-Id: I2090bc25d18e6d4f24e91c2cbfe832755cbb4e8f
* | | | Merge "Import translations. DO NOT MERGE"android-build-team Robot2018-05-022-2/+2
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2018-05-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b47773d779b0bdf951c89b4f6722905be1b81b0 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE"android-build-team Robot2018-05-0216-43/+43
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2018-05-0216-43/+43
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I9e53e7535fda1d3968ee37663fcc10a0db31eeb3 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE"android-build-team Robot2018-05-021-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2018-05-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I378efa60a01071f41b3bcdc88861051853867528 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE"android-build-team Robot2018-05-021-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2018-05-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I0446336688bb75efb9d0f8a41c035a60344a3762 Auto-generated-cl: translation import
* / / / / Import translations. DO NOT MERGEBill Yi2018-05-022-3/+3
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I53811c706460dfff30ac1b6539fc767c464de499 Auto-generated-cl: translation import
* | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵android-build-team Robot2018-04-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 12afc16019 -s ours am: ef49e17e65 -s ours Change-Id: Ifafd063a8dd22d3a967c8e3ae8668aa4db646287
| * | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: 12afc16019 -s ours Change-Id: I3dfc4eba9811bee854361e94f006723a57f6008f
| | * | Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-2819-53/+53
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2018-04-2719-53/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I1fa1dd1a62e97fb595a9004edf1d69071d2bdce8
* | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵android-build-team Robot2018-04-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a282948754 -s ours am: 2cafc09ed6 -s ours Change-Id: Ibd558eb8e97f84c8ad2065ca01b728d48273b1a8
| * | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a282948754 -s ours Change-Id: I8140f4284b9e74cb9c9c7111a9c1237a38356dc0
| | * | | Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-283-5/+5
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2018-04-273-5/+5
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I6f68e016f4e4206d43fb5a659ddfab21184f6910
* | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵android-build-team Robot2018-04-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 72de6118a9 -s ours am: 21d9a508af -s ours Change-Id: I2375f4bd2f36190b80429b32fc12db61407df2eb
| * | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 72de6118a9 -s ours Change-Id: I7e161b0565a5686924970a067c86790b3af035b3
| | * | | Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-281-1/+1
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2018-04-271-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I1803419e91e88e1601df974ba87495671de1049d
* | | | | [automerger skipped] Import translations. DO NOT MERGE am: 2ff803e2a3 -s oursBill Yi2018-04-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e5852a2943 -s ours Change-Id: I71091ffdd4cedac8779beaa684c1c992d1e57f2c
| * | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-04-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2ff803e2a3 -s ours Change-Id: I3da270d8b7e15a5797483b724227de07cb1cf2fe
| | * | | Import translations. DO NOT MERGEBill Yi2018-04-271-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ic5a4c6c9cda95d912d75bcc49da8656571d4d14b
* | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-04-2114-30/+30
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBill Yi2018-04-2114-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If993ed37322c2c3301a0e89295872afa4a0f7992 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-04-211-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2018-04-211-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I3df9864cae24cf551c0f9394fd62491655fe648b Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-04-213-24/+24
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2018-04-213-24/+24
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I8eaa684412c0b0ce80d6746f3a275c61ce5fa820 Auto-generated-cl: translation import
* / / / / Import translations. DO NOT MERGEBill Yi2018-04-211-1/+1
|/ / / / | | | | | | | | | | | | | | | | Change-Id: I5a2cfb0ec96d21a24892d0d023d10c7dad4c3af1 Auto-generated-cl: translation import
* | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2018-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0262bf8793 -s ours am: a3ff96d76a -s ours Change-Id: I688691ad835952bba5943eecddc59c85b5164565
| * | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: 0262bf8793 -s ours Change-Id: I850b67608222ab07dc68494a98a95940643bb046
| | * | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-172-21/+21
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2018-04-172-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ic07e1affb14655e1e0d5fe82ffb4fcfc063afd08
* | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2018-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ae571ef6e3 -s ours am: 6c2f64e9ab -s ours Change-Id: Ieaad6972fda48906a7f9eb207a00da9e23c69aaa
| * | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ae571ef6e3 -s ours Change-Id: I6381866dfd5c67d0d94954474dd15b23f1d6aa7e
| | * | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-179-19/+19
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2018-04-179-19/+19
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ifb115e7b8384e9ba72aa7c33daa8a79fa1b3b339
* | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2018-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4b3d9d53c2 -s ours am: 7172df0d08 -s ours Change-Id: I0a6b1be4499a2a6ba271b9989b58635f8bc1d536
| * | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4b3d9d53c2 -s ours Change-Id: I6f3cfd39b23c1488313249596a4b8fd366de32fe
| | * | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-171-1/+1
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2018-04-171-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I060b9121b992698d1874db2c0854a15f2291d932
* | | | | [automerger skipped] Import translations. DO NOT MERGE am: b251eda396 -s oursBill Yi2018-04-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dc29cd810f -s ours Change-Id: I2cac50818ce2c3b10f9c6c5652f02ea0d71d4596
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-01 23:16:06 +0000