Commit graph

41134 commits

Author SHA1 Message Date
android-build-team Robot
387a6d20f8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 2d86f24cb0  -s ours

Change-Id: Ifd794f379dd0c178cbe2d6fbbeaeaf7b70226345
2018-05-06 22:51:50 -07:00
Bill Yi
a9e343721c [automerger skipped] Import translations. DO NOT MERGE
am: 7a51bb5a4f  -s ours

Change-Id: I7ef3f02d52d77ad75ae1a315f4a5a48737a1da7a
2018-05-06 22:49:41 -07:00
android-build-team Robot
2d86f24cb0 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-05-07 05:47:51 +00:00
Yohei Yukawa
7a2459ca13 Merge java-overridable/ into java/ again
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
      fb74ab15c1

Fix: 79323502
Test: make -j aosp_taimen-userdebug && make -j
Test: tapas LatinIME && make -j
Change-Id: I2090bc25d18e6d4f24e91c2cbfe832755cbb4e8f
2018-05-06 20:46:17 -07:00
Bill Yi
0a84cab445 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Idcaaccff8ab717edfc84ed27e30b9b0a3288ba10
2018-05-03 19:17:59 -07:00
Bill Yi
7a51bb5a4f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8dd583f9628d0e0caa5a45cc646688f1fbc2ea08
2018-05-03 19:17:10 -07:00
android-build-team Robot
b280820dc4 Merge "Import translations. DO NOT MERGE" 2018-05-02 14:24:22 +00:00
android-build-team Robot
b144f0f54a Merge "Import translations. DO NOT MERGE" 2018-05-02 14:14:21 +00:00
android-build-team Robot
d6b7fb7cbe Merge "Import translations. DO NOT MERGE" 2018-05-02 14:14:02 +00:00
android-build-team Robot
98264d92c2 Merge "Import translations. DO NOT MERGE" 2018-05-02 14:13:29 +00:00
Bill Yi
b3a487c620 Import translations. DO NOT MERGE
Change-Id: I9e53e7535fda1d3968ee37663fcc10a0db31eeb3
Auto-generated-cl: translation import
2018-05-02 00:07:14 -07:00
Bill Yi
08853eb06e Import translations. DO NOT MERGE
Change-Id: I53811c706460dfff30ac1b6539fc767c464de499
Auto-generated-cl: translation import
2018-05-02 00:06:29 -07:00
Bill Yi
14d86e0cac Import translations. DO NOT MERGE
Change-Id: I0b47773d779b0bdf951c89b4f6722905be1b81b0
Auto-generated-cl: translation import
2018-05-02 00:04:36 -07:00
Bill Yi
fb5cf9e12e Import translations. DO NOT MERGE
Change-Id: I378efa60a01071f41b3bcdc88861051853867528
Auto-generated-cl: translation import
2018-05-02 00:03:29 -07:00
Bill Yi
b51944dbaf Import translations. DO NOT MERGE
Change-Id: I0446336688bb75efb9d0f8a41c035a60344a3762
Auto-generated-cl: translation import
2018-05-02 00:02:19 -07:00
android-build-team Robot
2b0dfa2065 Snap for 4751833 from 12afc16019 to pi-release
Change-Id: Ic614c5547e969dbe42f85109d25af2d993898860
2018-04-29 07:24:59 +00:00
android-build-team Robot
66f2aaf6c2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 12afc16019 -s ours
am: ef49e17e65  -s ours

Change-Id: Ifafd063a8dd22d3a967c8e3ae8668aa4db646287
2018-04-27 23:03:46 -07:00
android-build-team Robot
ef49e17e65 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 12afc16019  -s ours

Change-Id: I3dfc4eba9811bee854361e94f006723a57f6008f
2018-04-27 22:59:15 -07:00
android-build-team Robot
12afc16019 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-28 05:49:56 +00:00
android-build-team Robot
a3140e32df [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: a282948754 -s ours
am: 2cafc09ed6  -s ours

Change-Id: Ibd558eb8e97f84c8ad2065ca01b728d48273b1a8
2018-04-27 22:31:07 -07:00
android-build-team Robot
2cafc09ed6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: a282948754  -s ours

Change-Id: I8140f4284b9e74cb9c9c7111a9c1237a38356dc0
2018-04-27 22:25:36 -07:00
android-build-team Robot
2d957386f6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 72de6118a9 -s ours
am: 21d9a508af  -s ours

Change-Id: I2375f4bd2f36190b80429b32fc12db61407df2eb
2018-04-27 22:20:58 -07:00
Bill Yi
02425ce0b7 [automerger skipped] Import translations. DO NOT MERGE am: 2ff803e2a3 -s ours
am: e5852a2943  -s ours

Change-Id: I71091ffdd4cedac8779beaa684c1c992d1e57f2c
2018-04-27 22:20:42 -07:00
android-build-team Robot
a282948754 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-28 05:19:33 +00:00
android-build-team Robot
21d9a508af [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 72de6118a9  -s ours

Change-Id: I7e161b0565a5686924970a067c86790b3af035b3
2018-04-27 22:15:01 -07:00
Bill Yi
e5852a2943 [automerger skipped] Import translations. DO NOT MERGE
am: 2ff803e2a3  -s ours

Change-Id: I3da270d8b7e15a5797483b724227de07cb1cf2fe
2018-04-27 22:14:44 -07:00
android-build-team Robot
72de6118a9 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-28 05:08:46 +00:00
Bill Yi
067fff5620 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1fa1dd1a62e97fb595a9004edf1d69071d2bdce8
2018-04-27 20:31:53 -07:00
Bill Yi
6e84e34d9c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6f68e016f4e4206d43fb5a659ddfab21184f6910
2018-04-27 20:27:40 -07:00
Bill Yi
aa99b5fc39 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1803419e91e88e1601df974ba87495671de1049d
2018-04-27 20:26:07 -07:00
Bill Yi
2ff803e2a3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic5a4c6c9cda95d912d75bcc49da8656571d4d14b
2018-04-27 20:24:12 -07:00
TreeHugger Robot
9cb0fc6582 Merge "Import translations. DO NOT MERGE" 2018-04-21 17:08:25 +00:00
TreeHugger Robot
f3e6e2deb8 Merge "Import translations. DO NOT MERGE" 2018-04-21 17:06:22 +00:00
TreeHugger Robot
e91c739765 Merge "Import translations. DO NOT MERGE" 2018-04-21 17:04:33 +00:00
Bill Yi
7ec343ba9a Import translations. DO NOT MERGE
Change-Id: If993ed37322c2c3301a0e89295872afa4a0f7992
Auto-generated-cl: translation import
2018-04-21 06:50:09 -07:00
Bill Yi
a918b1df6a Import translations. DO NOT MERGE
Change-Id: I5a2cfb0ec96d21a24892d0d023d10c7dad4c3af1
Auto-generated-cl: translation import
2018-04-21 06:49:52 -07:00
Bill Yi
7f3fbc5e37 Import translations. DO NOT MERGE
Change-Id: I8eaa684412c0b0ce80d6746f3a275c61ce5fa820
Auto-generated-cl: translation import
2018-04-21 06:49:14 -07:00
Bill Yi
57314e45d6 Import translations. DO NOT MERGE
Change-Id: I3df9864cae24cf551c0f9394fd62491655fe648b
Auto-generated-cl: translation import
2018-04-21 06:48:46 -07:00
android-build-team Robot
1d8dd62b25 Snap for 4728508 from 0262bf8793 to pi-release
Change-Id: Ic1e738c570152dc3ac72850fd3db48f077b61b73
2018-04-18 07:28:03 +00:00
Bill Yi
de3f29ac75 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 0262bf8793 -s ours
am: a3ff96d76a  -s ours

Change-Id: I688691ad835952bba5943eecddc59c85b5164565
2018-04-17 07:47:12 -07:00
Bill Yi
a57da39f85 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: ae571ef6e3 -s ours
am: 6c2f64e9ab  -s ours

Change-Id: Ieaad6972fda48906a7f9eb207a00da9e23c69aaa
2018-04-17 07:46:35 -07:00
Bill Yi
2451cd94c4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 4b3d9d53c2 -s ours
am: 7172df0d08  -s ours

Change-Id: I0a6b1be4499a2a6ba271b9989b58635f8bc1d536
2018-04-17 07:43:08 -07:00
Bill Yi
a3ff96d76a [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 0262bf8793  -s ours

Change-Id: I850b67608222ab07dc68494a98a95940643bb046
2018-04-17 07:35:08 -07:00
Bill Yi
6c2f64e9ab [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: ae571ef6e3  -s ours

Change-Id: I6381866dfd5c67d0d94954474dd15b23f1d6aa7e
2018-04-17 07:34:36 -07:00
Bill Yi
7172df0d08 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 4b3d9d53c2  -s ours

Change-Id: I6f3cfd39b23c1488313249596a4b8fd366de32fe
2018-04-17 07:32:20 -07:00
Bill Yi
9d62c1c9e9 [automerger skipped] Import translations. DO NOT MERGE am: b251eda396 -s ours
am: dc29cd810f  -s ours

Change-Id: I2cac50818ce2c3b10f9c6c5652f02ea0d71d4596
2018-04-17 07:21:55 -07:00
TreeHugger Robot
0262bf8793 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-17 14:20:23 +00:00
TreeHugger Robot
ae571ef6e3 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-17 14:18:34 +00:00
TreeHugger Robot
4b3d9d53c2 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-17 14:18:32 +00:00
Bill Yi
dc29cd810f [automerger skipped] Import translations. DO NOT MERGE
am: b251eda396  -s ours

Change-Id: Idf1027330f47b5ed6eeb22c3e9d81f975d655c57
2018-04-17 07:16:58 -07:00