Bill Yi
7eff036f7d
[automerger skipped] Import translations. DO NOT MERGE
...
am: 145808acad
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie5059b38c3e176cb660f54eb406027a60ded0d01
2019-03-27 01:14:10 -07:00
Bill Yi
145808acad
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I5d712356e5bc9cc77bbaa3a1f65ecdef6284b4a8
2019-03-26 22:45:52 -07:00
Xin Li
9cd8eb5a9a
Merge stage-aosp-master into pi-dev-plus-aosp
...
Bug: 126125118
Change-Id: I62739cff8c2223b4c5d8fef4565fba74c65067f8
2019-02-25 00:31:17 -08:00
Bill Yi
d2a0448138
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 289a72634b
-s ours
am skip reason: subject contains skip directive
Change-Id: I4b8e3e2002bef629f14c741ffdf26f9f585ae4cf
2019-02-21 11:17:35 -08:00
Bill Yi
6c7f0252df
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 624bac2cd8
-s ours
am skip reason: subject contains skip directive
Change-Id: I39a6eb25425d7d6a5d9f0b9b6c93d398aec3d7ce
2019-02-21 11:17:13 -08:00
Bill Yi
ecce81d600
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: a921223fe2
-s ours
am skip reason: subject contains skip directive
Change-Id: I27620645836d7e3e26894cbbff72e92cd1e54d9d
2019-02-21 11:16:51 -08:00
Bill Yi
151132139a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 01900e65fc
-s ours
am skip reason: subject contains skip directive
Change-Id: I01f062132b5b6b40de3f532a0b4c48da14ffa0c9
2019-02-21 11:16:28 -08:00
Bill Yi
1513b865a7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: e951835344
-s ours
am skip reason: subject contains skip directive
Change-Id: I9b53ac21775b9611c5eb407f9619f51851b55aea
2019-02-21 11:16:11 -08:00
Bill Yi
8c9163d180
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 35ac417ae0
-s ours
am skip reason: subject contains skip directive
Change-Id: Iddece47182ff08386f7bcaa402c74eeaca57a693
2019-02-21 11:15:30 -08:00
Bill Yi
1079e974a3
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9e73c487e4
-s ours
am skip reason: subject contains skip directive
Change-Id: I36af548ea6984fda2645809575e5b9566b163308
2019-02-21 11:13:23 -08:00
TreeHugger Robot
289a72634b
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:47:25 +00:00
TreeHugger Robot
624bac2cd8
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:36:34 +00:00
TreeHugger Robot
a921223fe2
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:32:55 +00:00
TreeHugger Robot
01900e65fc
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:30:35 +00:00
TreeHugger Robot
e951835344
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:29:46 +00:00
TreeHugger Robot
35ac417ae0
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:23:15 +00:00
Xin Li
c6989a55f8
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: I0ce28bf5229c1f1c98a51d86c2eaa15ec9efa73e
2019-02-21 09:25:08 -08:00
Bill Yi
9e73c487e4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2b984642494033f59d02cf4c640793b47e63c6b3
2019-02-21 06:21:12 -08:00
Bill Yi
621f24c948
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I7809654384cc42e87999e222316e25f4bd70641f
2019-02-21 06:17:52 -08:00
Bill Yi
463afb44e2
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I136d94f85222806b5104a16b6d544dc1c377c5e3
2019-02-21 06:12:24 -08:00
Bill Yi
c57cda4a3a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6e496165fde5ea66dda1559f39a0c02c949265b0
2019-02-21 06:08:02 -08:00
Bill Yi
42f8490ea3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ied44fc2e6b9256a6744387ca511946b21fd44524
2019-02-21 06:04:26 -08:00
Bill Yi
685f412885
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9edb7e3ebf58bdf8fe5b12096c37815e58a39e40
2019-02-21 06:01:44 -08:00
Bill Yi
f82540f2d4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I05cf27d7d1a197dde37d6dc69433c26e62c88458
2019-02-21 05:59:00 -08:00
Xin Li
e4b43c4fbc
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: 7a26716635
-s ours
...
am: 3131e40bd0
-s ours
am skip reason: subject contains skip directive
Change-Id: If88ba09f1f42f81715f1fc058056f30260a27f76
2019-02-20 11:48:02 -08:00
Xin Li
3131e40bd0
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
...
am: 7a26716635
-s ours
am skip reason: subject contains skip directive
Change-Id: I987ab9b831b98585ec81dfb09ef7c2a9e231050c
2019-02-20 11:09:54 -08:00
Xin Li
d89fe26246
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 55f3303cbb
-s ours
...
am: 44fd4cee32
-s ours
am skip reason: subject contains skip directive
Change-Id: I39de5a3e6d74ff3c40509fb86b20ed58a0fa2c00
2019-02-20 09:29:40 -08:00
Xin Li
44fd4cee32
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
...
am: 55f3303cbb
-s ours
am skip reason: subject contains skip directive
Change-Id: I6b4a32fb876ebb56043708b575cbf72b870617b8
2019-02-20 08:53:05 -08:00
Xin Li
7a26716635
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
2019-02-20 16:25:59 +00:00
Xin Li
55f3303cbb
DO NOT MERGE - Merge PPRL.190205.001 into master
...
Bug: 124234733
Change-Id: I7e1e95d48518ba22d651ac5301f59d0576eae5f3
2019-02-18 15:58:48 -08:00
Xin Li
69d7bc2bc2
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
am: edb32289f2
-s ours
am skip reason: subject contains skip directive
Change-Id: Ideb2a4ae6b8035057793c5b6a8f23fb823bc6930
2019-02-14 14:42:16 -08:00
Xin Li
edb32289f2
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
Bug: 124234733
Change-Id: I7cf7739a6a70d4caeb1c20a3c1c4f33a05568670
2019-02-12 09:53:45 -08:00
android-build-team Robot
20de0ce610
Snap for 5180536 from 556b091a75
to pi-platform-release
...
Change-Id: I0d7de023eac68880bab0b670385e67b721a5abcf
2019-02-09 02:34:49 +00:00
Anton Hansson
d894eec1ee
Merge "Move LatinIME and its lib to /product" am: 149b9d4f6e
...
am: 84d156b1e6
Change-Id: I386b9b5ed6ba02a4cd00efb75804ffef24603a2c
2019-01-14 01:56:34 -08:00
Anton Hansson
84d156b1e6
Merge "Move LatinIME and its lib to /product"
...
am: 149b9d4f6e
Change-Id: I8cdefaaa460ff09dfb410c5406735676669ce9c1
2019-01-14 01:31:41 -08:00
Anton Hansson
149b9d4f6e
Merge "Move LatinIME and its lib to /product"
2019-01-14 09:06:53 +00:00
Bill Yi
dcf087ef89
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 06c8063be0
-s ours
am skip reason: subject contains skip directive
Change-Id: I361ed1fa55f6dc6d7b7aee8984e61873114988fb
2019-01-13 16:40:11 -08:00
TreeHugger Robot
06c8063be0
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-01-14 00:34:29 +00:00
Bill Yi
d4290f3b50
[automerger skipped] Import translations. DO NOT MERGE
...
am: 54b7ed4a9d
-s ours
am skip reason: subject contains skip directive
Change-Id: Iccec905e74b8a20923ddf92db0beda0278d5cdfb
2019-01-13 16:21:28 -08:00
Bill Yi
54b7ed4a9d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I55aec88a6c77441c68c7121cab8dcce25d5ef4cc
2019-01-13 01:12:10 -08:00
Bill Yi
ab4f7ace74
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9baa804b18e008b1083ef970d9d3c12498364744
2019-01-13 01:08:13 -08:00
Anton Hansson
1c429e3a09
Move LatinIME and its lib to /product
...
This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product along with
its jni library.
Bug: 122353713
Test: launch keyboard on aosp_arm64 emulator
Change-Id: Ied8c1e6133b67e28da76b0e48254e2e2e0ed15bf
2019-01-11 15:20:31 +00:00
Bill Yi
fde4ac8f22
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 2d2288f37c
-s ours
Change-Id: I496ac1555af61b6f2e8a52074e2416ad1113a320
2018-12-28 14:10:47 -08:00
TreeHugger Robot
2d2288f37c
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-12-28 22:05:37 +00:00
Bill Yi
fe242b4e99
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: ba23f94b7b
-s ours
Change-Id: Ib222f7a1f0a43d6b0adea55afca349dc6bd83319
2018-12-28 12:24:12 -08:00
Bill Yi
91f0e976a7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: e921fbc7db
-s ours
Change-Id: I93766f2c63586fd097f0dd6f590bdeb73b5fdb95
2018-12-28 12:20:57 -08:00
Bill Yi
6cb7229dd1
[automerger skipped] Import translations. DO NOT MERGE
...
am: 3d3c1cd8bc
-s ours
Change-Id: I03c34a8e17282a8e2e5a02fdee1132a829d55909
2018-12-28 12:20:05 -08:00
TreeHugger Robot
ba23f94b7b
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-12-28 20:17:46 +00:00
TreeHugger Robot
e921fbc7db
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-12-28 20:10:37 +00:00
Bill Yi
80e3014666
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id860302ad84eb62980b4a945874cb45edfdcc687
2018-12-28 10:44:42 -08:00