Xin Li
9461d4e8c5
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
am: b4be6d6430
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibc75869dd909035714a59174ce287e32d3ccf9fe
2019-05-09 16:10:25 -07:00
Xin Li
b4be6d6430
DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
Bug: 131756210
Change-Id: Ifc5dca915dcc06eb42e39f73010bef244dfbe26e
2019-05-09 09:27:06 -07:00
Bill Yi
e8bbcdbf9e
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: f45e8bad27
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic923497feebd8662e3a9c44140f696e76247d235
2019-04-12 15:54:48 -07:00
Bill Yi
56b43fff1f
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: 25324a9dc4
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib192b5ef047ed576087be8f4d7c28c42b336db3b
2019-04-12 15:54:29 -07:00
Bill Yi
120986cc45
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: 97949e8822
-s ours
am skip reason: subject contains skip directive
Change-Id: I2ab9374888ff6cf49416f6264a434774d1cdaa18
2019-04-12 15:54:09 -07:00
Bill Yi
3687c29f0b
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: fa3c3e2e24
-s ours
am skip reason: subject contains skip directive
Change-Id: I207783ca8cb6b06c015d4ef774e9f9478e2beb75
2019-04-12 15:53:30 -07:00
Bill Yi
64ab24d687
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: 6ca3f2666f
-s ours
am skip reason: subject contains skip directive
Change-Id: I28d7d66c347ddd73cc199cd10037fd5a130c20aa
2019-04-12 15:51:11 -07:00
Treehugger Robot
f45e8bad27
Merge "Import translations. DO NOT MERGE"
2019-04-12 21:56:28 +00:00
Treehugger Robot
25324a9dc4
Merge "Import translations. DO NOT MERGE"
2019-04-12 21:52:36 +00:00
Treehugger Robot
97949e8822
Merge "Import translations. DO NOT MERGE"
2019-04-12 21:52:31 +00:00
Treehugger Robot
fa3c3e2e24
Merge "Import translations. DO NOT MERGE"
2019-04-12 21:51:31 +00:00
Treehugger Robot
6ca3f2666f
Merge "Import translations. DO NOT MERGE"
2019-04-12 21:51:29 +00:00
Bill Yi
92b7cf044a
Import translations. DO NOT MERGE
...
Change-Id: I904d86d309ea2d7f9580b5e09dca41bfb60cff40
Auto-generated-cl: translation import
2019-04-12 12:01:27 -07:00
Bill Yi
818bc3825e
Import translations. DO NOT MERGE
...
Change-Id: I1d2df81d65ab959a10b2de2988384f8fb75715af
Auto-generated-cl: translation import
2019-04-12 12:00:35 -07:00
Bill Yi
197d655d99
Import translations. DO NOT MERGE
...
Change-Id: I142d2d3f4b1426baab015fb8d915bb40d0de16d7
Auto-generated-cl: translation import
2019-04-12 11:58:43 -07:00
Bill Yi
0630c00d44
Import translations. DO NOT MERGE
...
Change-Id: I3636200116fa13979c6414f7d9d427f460d10b72
Auto-generated-cl: translation import
2019-04-12 11:57:09 -07:00
Bill Yi
349d66a935
Import translations. DO NOT MERGE
...
Change-Id: I08d454ae10fb1013bdf04bdece7a0d9b04862681
Auto-generated-cl: translation import
2019-04-12 11:56:32 -07: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
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
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
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
Bill Yi
3d3c1cd8bc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6c89395f7bef7820235bd25d506493ab2bd577e5
2018-12-28 10:43:51 -08:00
Bill Yi
10af3a4c3c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I1bb720f59308fd358bf855f68bec70fa4884f197
2018-12-28 10:42:05 -08:00
Bill Yi
ddfe606cca
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Iedbf75b9435c748ada110ea50847d4be9efe5f79
2018-12-28 10:40:03 -08:00
Chih-Hung Hsieh
535cd61e63
Merge "Fix performance-for-range-copy warnings" am: db2e4888f8
...
am: 947f8ee063
Change-Id: I153c9732d7fd1733f196b9807d99cfe59fcde012
2018-12-11 16:20:39 -08:00
Chih-Hung Hsieh
947f8ee063
Merge "Fix performance-for-range-copy warnings"
...
am: db2e4888f8
Change-Id: I543e720cb8f79f4464a69a4365ca28c4942e160c
2018-12-11 14:59:57 -08:00
Treehugger Robot
db2e4888f8
Merge "Fix performance-for-range-copy warnings"
2018-12-11 21:01:25 +00:00
Chih-Hung Hsieh
895bf97d22
Fix performance-for-range-copy warnings
...
Bug: 30413223
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance*
Change-Id: I06021a6597705515dc7a3cb81a7fbbac7ba344a1
2018-12-11 10:40:46 -08:00
The Android Open Source Project
6c06f06079
[automerger skipped] Merge "DO NOT MERGE" am: 55748c5936
-s ours
...
am: 49424a1b52
-s ours
Change-Id: Iaf13380ed7bfbf451a004c18ef2780073fd9c3f7
2018-12-06 18:25:07 -08:00
The Android Open Source Project
49424a1b52
[automerger skipped] Merge "DO NOT MERGE"
...
am: 55748c5936
-s ours
Change-Id: Id2dad517baa422d9f304dd2203892865db632aa3
2018-12-06 17:59:17 -08:00