Bill Yi
61cef80d90
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9727374039
-s ours
Change-Id: I89930319804866d4828517d06941049afb70412c
2018-11-10 06:47:45 -08:00
TreeHugger Robot
f1f7f05512
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-11-10 14:44:20 +00:00
Bill Yi
9727374039
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If1a85bd7e787396faf8fb780a96e598c81dc4087
2018-11-10 00:11:52 -08:00
Bill Yi
af30ac8326
Import translations. DO NOT MERGE
...
Change-Id: Iec7f8162a5f1fa6323b5aaad028982d27ae4d703
Auto-generated-cl: translation import
2018-11-10 00:10:48 -08:00
Bill Yi
968f11511b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6dd75f52e619fdc8c3d54ea223f0e35171b3bc1c
2018-11-09 23:52:56 -08:00
Bill Yi
517e77569e
Import translations. DO NOT MERGE
...
Change-Id: I2cf19a83bd266325c4a1b37344bdab61753cdbca
Auto-generated-cl: translation import
2018-11-09 23:51:36 -08:00
Dan Willemsen
29e2bcb6c9
[automerger skipped] Merge "Convert to Android.bp" am: 128f68acb2
am: 8e315deff9
...
am: 948cbbe986
-s ours
Change-Id: I3d252fbba6968af7dcc3d9d6be16a0d2d8b062a7
2018-11-08 17:15:09 -08:00
Dan Willemsen
948cbbe986
Merge "Convert to Android.bp" am: 128f68acb2
...
am: 8e315deff9
Change-Id: I9d256889dbc4717293cff2b0ddd6e867ae54e47d
2018-11-08 17:03:45 -08:00
Dan Willemsen
8e315deff9
Merge "Convert to Android.bp"
...
am: 128f68acb2
Change-Id: I368f3b987cf1930d745edbd9c4740e61cee9b223
2018-11-08 16:58:30 -08:00
Treehugger Robot
128f68acb2
Merge "Convert to Android.bp"
2018-11-09 00:38:40 +00:00
android-build-team Robot
da66c2095d
Snap for 5115288 from 2a04a34ee7
to pi-qpr2-release
...
Change-Id: I9dda63f33991c56765c7c1d5cc546af087f3e16c
2018-11-07 04:06:50 +00:00
Bill Yi
31dd19aa86
[automerger skipped] Import translations. DO NOT MERGE am: 2a04a34ee7
-s ours
...
am: a244f80898
-s ours
Change-Id: Icb287f1dfd3ffba060a077cf745a7854512578d2
2018-11-06 07:03:18 -08:00
Bill Yi
a244f80898
[automerger skipped] Import translations. DO NOT MERGE
...
am: 2a04a34ee7
-s ours
Change-Id: I816243c0ed8b9eb9fb26d266154162f3bf0c392d
2018-11-06 06:58:36 -08:00
Bill Yi
2a04a34ee7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I075d4469fed4c68a77c131c2f9d76ec283fe0b04
2018-11-06 05:31:13 -08:00
Bill Yi
23e7ffb238
[automerger skipped] Import translations. DO NOT MERGE am: 13611e7a26
-s ours
...
am: 36d1eed8fc
-s ours
Change-Id: Ia8943cea6e03d2fcaa4269b9f521fef105d3d856
2018-11-02 21:07:12 -07:00
Bill Yi
36d1eed8fc
[automerger skipped] Import translations. DO NOT MERGE
...
am: 13611e7a26
-s ours
Change-Id: I3c42d26416feedb8b7bfb9862744fcd0c22da76d
2018-11-02 16:58:50 -07:00
Bill Yi
13611e7a26
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I42759929af5c662c4b5d306b4967e67f5ad05547
2018-11-02 11:02:18 -07:00
Dan Willemsen
a23407bf62
Convert to Android.bp
...
See build/soong/README.md for more information.
Test: cd packages/inputmethods/LatinIME; mma
Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
Merged-In: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
2018-11-01 23:09:33 +00:00
Dan Willemsen
22ebec6e2e
Convert to Android.bp
...
See build/soong/README.md for more information.
Test: cd packages/inputmethods/LatinIME; mma
Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
2018-10-31 21:49:02 -07:00
Tadashi G. Takaoka
b6301306fa
Merge "Fix dicttool build" am: a92d0f9262
am: 438a303732
...
am: 6aed05232b
Change-Id: I558fb5ff22a7428d1d82eac82b4caba469ed48d4
2018-10-31 09:24:08 -07:00
Tadashi G. Takaoka
6aed05232b
Merge "Fix dicttool build" am: a92d0f9262
...
am: 438a303732
Change-Id: If8b5ba833fa6872fcaeb43dbd7b0b0c9a5c65986
2018-10-31 09:18:51 -07:00
Tadashi G. Takaoka
438a303732
Merge "Fix dicttool build"
...
am: a92d0f9262
Change-Id: I154c551c433cc8ef4a17268d57429e38ab962be0
2018-10-31 09:10:41 -07:00
Treehugger Robot
a92d0f9262
Merge "Fix dicttool build"
2018-10-31 15:59:23 +00:00
android-build-team Robot
2c3de1ee6e
Snap for 5101444 from 9855237563
to pi-qpr2-release
...
Change-Id: I231dc9c6d0c93dfd0cb3b0638728f9cba623628a
2018-10-31 03:03:56 +00:00
Bill Yi
fd7874f153
[automerger skipped] Import translations. DO NOT MERGE am: 9855237563
-s ours
...
am: 9468765b14
-s ours
Change-Id: I48bf7fc388d08dbc9c9b886d3f7b72f75e3979c7
2018-10-29 11:57:50 -07:00
Bill Yi
9468765b14
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9855237563
-s ours
Change-Id: I9c79f7537f938ffb2ad35aa10e90da11bf33ee19
2018-10-29 11:47:38 -07:00
Tadashi G. Takaoka
6a1b37353d
Fix dicttool build
...
This CL partially reverts
- Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c
- I05c7d8429e8d9a26139456763c77997340fea8c2
And followup (remove shortcut support)
- I73b7dc008a5acaf75a31a36a2d332b5afabd82d0
Bug: 28255684
Test: make -j10 dicttool_aosp
Change-Id: I2e01ed86b9517a1141aee35ea6d8ef39258981d1
2018-10-29 15:59:05 +09:00
Bill Yi
9855237563
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I27785eae6f6e44e130a7cad0cfedeb8ed630e95f
2018-10-28 14:41:50 -07:00
Bill Yi
9c8608c642
Import translations. DO NOT MERGE
...
Change-Id: I60b4bb2939b9e6bb73072b3c2e96ca197c41f6f2
Auto-generated-cl: translation import
2018-10-25 06:24:18 -07:00
Bill Yi
2c1b04d000
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c42acc5344
-s ours am: 49962938cd
-s ours
...
am: e9c8624a2d
-s ours
Change-Id: I2b11a4ba4addf06b9a0f3e305e7a199f3b2a377b
2018-10-24 19:58:54 -07:00
Bill Yi
e9c8624a2d
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c42acc5344
-s ours
...
am: 49962938cd
-s ours
Change-Id: Idbf577a6d169abc1210dd51d1ed171a15c4ec116
2018-10-24 18:54:49 -07:00
Bill Yi
49962938cd
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: c42acc5344
-s ours
Change-Id: I3c7d427021df4d397825c057b542f86af61463bd
2018-10-24 15:50:27 -07:00
Bill Yi
c42acc5344
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: I3d15592c5348f486cff59899be87a4ee0e83f49e
2018-10-24 14:47:31 -07:00
Bill Yi
8daaeb0231
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: a5a6293c3e
-s ours
...
am: 7898118eab
-s ours
Change-Id: I358d4586c415d5d86cb7084d5f8ed571cb86f7eb
2018-10-24 09:59:08 -07:00
Bill Yi
7898118eab
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: a5a6293c3e
-s ours
Change-Id: Ie762dbf883cdeb76d6441da58cb32d9c170c60ca
2018-10-24 09:45:44 -07:00
Bill Yi
a5a6293c3e
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I3ee77030c1d13c9ec62399268c4376989863c607
2018-10-24 09:07:17 -07:00
Bill Yi
35c16df3da
Merge pi-dr1-dev to aosp-master am: 265cd16db2
am: b445ba31e3
...
am: 86c77e01ef
Change-Id: I95ec455313fbe35da44797c66c219b3ef01d24be
2018-10-19 15:46:12 -07:00
Bill Yi
86c77e01ef
Merge pi-dr1-dev to aosp-master am: 265cd16db2
...
am: b445ba31e3
Change-Id: Ide69e3c6ffaf78a74428ee4627da22bdeedf1a3b
2018-10-19 15:29:29 -07:00
Bill Yi
b445ba31e3
Merge pi-dr1-dev to aosp-master
...
am: 265cd16db2
Change-Id: I5299e4e7abe18f0a8d047dcf546c8e241f04d2d9
2018-10-19 15:12:31 -07:00
Bill Yi
265cd16db2
Merge pi-dr1-dev to aosp-master
...
Change-Id: I335f17b757a13ef34f4abb6fd159bcaa3574a1b2
2018-10-19 12:20:51 -07:00
android-build-team Robot
a40f3c93bb
Snap for 5073521 from 67efbc844c
to pi-qpr2-release
...
Change-Id: I027c4c4d21d645b6fd4120fbdd6f5b27487b6817
2018-10-17 03:05:32 +00:00
Bill Yi
d42a395c6f
[automerger skipped] Import translations. DO NOT MERGE am: 67efbc844c
-s ours
...
am: de676d6315
-s ours
Change-Id: I136bb221a0ef452bd6791a22d72f750500f29fd8
2018-10-15 15:46:35 -07:00
Bill Yi
de676d6315
[automerger skipped] Import translations. DO NOT MERGE
...
am: 67efbc844c
-s ours
Change-Id: Ic593c6d12dd7e9450a8d606a39c5ec128fb95772
2018-10-15 15:42:30 -07:00
Bill Yi
67efbc844c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8f0f4691bcdb730d71feae0616c65f1e38b99b06
2018-10-15 09:48:59 -07:00
Paul Duffin
5498a16c75
Merge "Remove paulduffin@ from OWNERS" am: e2a4d47ff2
am: 69989d1156
...
am: da077adb06
Change-Id: I0350bd4ef56746802cf8e643757c59afdd97ba48
2018-10-15 05:18:18 -07:00
Paul Duffin
da077adb06
Merge "Remove paulduffin@ from OWNERS" am: e2a4d47ff2
...
am: 69989d1156
Change-Id: Ie8a5d726a5250134313f436eba5b871ff1a5039b
2018-10-15 05:13:10 -07:00
Paul Duffin
69989d1156
Merge "Remove paulduffin@ from OWNERS"
...
am: e2a4d47ff2
Change-Id: I78e339ead245e67fce1233f304f01518ed61bd99
2018-10-15 05:05:57 -07:00
Paul Duffin
e2a4d47ff2
Merge "Remove paulduffin@ from OWNERS"
2018-10-15 11:52:49 +00:00
Bill Yi
0b59391ecf
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: fe42418de4
-s ours
...
am: 6141ad5079
-s ours
Change-Id: Ic02e2b1985465acd6ff0d29fcaaca94859d6297a
2018-10-13 20:03:46 -07:00
Bill Yi
879a4ff6d2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5958fb4cbc
-s ours
...
am: cf6ae73d4c
-s ours
Change-Id: Ib7c624d3b5e952d2313a7caef24bcdf80155a892
2018-10-13 20:03:33 -07:00