Bill Yi
7176ec18c0
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4e6a16562f
-s ours
...
am: b850f9382b
-s ours
Change-Id: I7df546facc67bd2ed5a6ad2e6a6af51d8866f6c4
2017-08-05 13:59:54 +00:00
Bill Yi
26aa613cdd
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1c5760eeae
-s ours
...
am: 0820c8b1a3
-s ours
Change-Id: I311b0e707e30557b6da051ab07c6f83cc934e755
2017-08-05 13:59:40 +00:00
Bill Yi
46d1920056
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e5580385b1
-s ours
...
am: 77205e18f1
-s ours
Change-Id: I828e98d95bb0e615082ef9e4717de97ca4931712
2017-08-05 13:57:42 +00:00
Bill Yi
fcd2b1c3ae
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4e6a16562f
-s ours
...
am: 3f04bc1968
-s ours
Change-Id: I45d387148fe7330773576798cca08b6d55cbdf0c
2017-08-05 13:56:56 +00:00
Bill Yi
72edb9a0dc
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1c5760eeae
-s ours
...
am: 77e56c9dd0
-s ours
Change-Id: I23c27423012f7632d4a7943c2e77f8c8b6971b1e
2017-08-05 13:55:43 +00:00
Bill Yi
b850f9382b
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 4e6a16562f
-s ours
Change-Id: Ie9b477d8cafdef509a356400b1643007b54e40e6
2017-08-05 13:46:45 +00:00
Bill Yi
0820c8b1a3
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 1c5760eeae
-s ours
Change-Id: I54e64200e282e643df107bd209ba1b913fc84ea3
2017-08-05 13:46:32 +00:00
Bill Yi
77205e18f1
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: e5580385b1
-s ours
Change-Id: If0e4813d007f5b5d9a8817b899c9c112464c4b45
2017-08-05 13:40:47 +00:00
Bill Yi
3f04bc1968
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 4e6a16562f
-s ours
Change-Id: I384541fe2899c577f976de58b21f43519ed66075
2017-08-05 13:37:21 +00:00
Bill Yi
77e56c9dd0
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 1c5760eeae
-s ours
Change-Id: I83142fed8969dcec8f81fac7380ea79b7044f0fa
2017-08-05 13:36:51 +00:00
TreeHugger Robot
e5580385b1
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-08-05 13:32:26 +00:00
Android Build Merger (Role)
ba869f3a8c
Merge "Import translations. DO NOT MERGE am: aee9e596da
-s ours am: 91bda9c6a0
-s ours" into oc-mr1-dev-plus-aosp
2017-08-05 13:15:49 +00:00
Bill Yi
4b02bb169a
Import translations. DO NOT MERGE am: aee9e596da
-s ours
...
am: 91bda9c6a0
-s ours
Change-Id: I3b605b5507cc90a64b7c783af5e60eda16a65e68
2017-08-05 13:15:32 +00:00
Bill Yi
1b8d6e552d
Import translations. DO NOT MERGE am: aee9e596da
-s ours
...
am: a454525301
-s ours
Change-Id: I0b8aefba29c46a42fc0866fcabba84f331f8b8e0
2017-08-05 13:15:28 +00:00
TreeHugger Robot
4e6a16562f
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-08-05 13:14:07 +00:00
TreeHugger Robot
1c5760eeae
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-08-05 13:12:40 +00:00
Bill Yi
91bda9c6a0
Import translations. DO NOT MERGE
...
am: aee9e596da
-s ours
Change-Id: I917a46e6bec9e4bf83df1182bb5a95374bddc749
2017-08-05 13:09:01 +00:00
Bill Yi
a454525301
Import translations. DO NOT MERGE
...
am: aee9e596da
-s ours
Change-Id: I359f1bc3dd4daf38f24efec5c1083dbdc338c666
2017-08-05 13:08:30 +00:00
Bill Yi
aee9e596da
Import translations. DO NOT MERGE
...
Change-Id: Ic0b774fdb8cbc8507e6534c13b3d64db79031dea
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 04:04:08 -07:00
Bill Yi
2edf45cf58
Import translations. DO NOT MERGE
...
Change-Id: I6c77cd10984dd07fe76ae62b4839b801b1aa7650
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 03:56:02 -07:00
Bill Yi
07d9ac7511
Import translations. DO NOT MERGE
...
Change-Id: I33047c58713582da7ed206b22faa4ff11024cf9d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 03:54:25 -07:00
Bill Yi
8c41d69776
Import translations. DO NOT MERGE
...
Change-Id: Ib837b11a00db2397e55a6258b4ce69bbd7d93442
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 03:52:22 -07:00
Bill Yi
4535888bfe
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5
-s ours am: 9467382a44
-s ours am: 2e2dfc94fc
-s ours
...
am: b68b01872a
-s ours
Change-Id: I7e37986af29b210c35633c9c2f126b4629d99fbf
2017-07-27 02:18:43 +00:00
Bill Yi
0afbf0f6df
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5
-s ours am: 9467382a44
-s ours am: 4a6a014605
-s ours
...
am: 788000450f
-s ours
Change-Id: I21ac0dd5be2a6a3e510297fd9509847339e2b094
2017-07-27 02:18:30 +00:00
Bill Yi
e3f0231a8f
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5
-s ours am: 9467382a44
-s ours am: 4a6a014605
-s ours
...
am: 80ef755c2c
-s ours
Change-Id: I7853b039065f51aa16305b9c7affea4fc4878e18
2017-07-27 02:05:59 +00:00
Bill Yi
80ef755c2c
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5
-s ours am: 9467382a44
-s ours
...
am: 4a6a014605
-s ours
Change-Id: I94fa00db6bb4546397583fb22681dcc5dd0a9c3c
2017-07-27 01:25:57 +00:00
Bill Yi
b68b01872a
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5
-s ours am: 9467382a44
-s ours
...
am: 2e2dfc94fc
-s ours
Change-Id: I7cec44bded9fcfe5267265a95986a228c6af6fd7
2017-07-27 01:25:20 +00:00
Bill Yi
788000450f
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5
-s ours am: 9467382a44
-s ours
...
am: 4a6a014605
-s ours
Change-Id: I7b16e3b03f740fc5004331e0f4de2ecdc8817c51
2017-07-27 01:20:49 +00:00
Bill Yi
2e2dfc94fc
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5
-s ours
...
am: 9467382a44
-s ours
Change-Id: I79e5a199e94ac635f0b8b8b6eaea3d3b4c98457f
2017-07-27 00:56:56 +00:00
Bill Yi
4a6a014605
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5
-s ours
...
am: 9467382a44
-s ours
Change-Id: I33d15a705ef8eabba215efb59a4b583111b34265
2017-07-27 00:56:55 +00:00
Bill Yi
9467382a44
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 01422e1ff5
-s ours
Change-Id: I7745987e0e30d8bde20015409da01213fc8903d8
2017-07-26 23:23:05 +00:00
Android Build Merger (Role)
22de4082c6
Merge "Import translations. DO NOT MERGE am: 03907bdaeb
-s ours am: e688963174
-s ours am: c3e81eb7d2
-s ours am: c813e90ef2
-s ours" into oc-mr1-dev-plus-aosp
2017-07-26 22:27:12 +00:00
Bill Yi
e1b70b181a
Import translations. DO NOT MERGE am: 03907bdaeb
-s ours am: e688963174
-s ours am: c3e81eb7d2
-s ours
...
am: c813e90ef2
-s ours
Change-Id: I857ad147df80bff7cd328e6617a9122cf3f4bf72
2017-07-26 22:27:00 +00:00
Bill Yi
e99bc95d58
Import translations. DO NOT MERGE am: 03907bdaeb
-s ours am: e688963174
-s ours am: c3e81eb7d2
-s ours
...
am: 557bfe57d5
-s ours
Change-Id: I1d293852fd63267a39ecc3db9262360170ecdd2a
2017-07-26 22:26:52 +00:00
Bill Yi
48e760f74d
Import translations. DO NOT MERGE am: 03907bdaeb
-s ours am: e688963174
-s ours am: 301645fdf5
-s ours
...
am: 216737e6f7
-s ours
Change-Id: I417d34faca45e16b76bbe5e16dd94be9f389cf9d
2017-07-26 22:26:39 +00:00
Bill Yi
557bfe57d5
Import translations. DO NOT MERGE am: 03907bdaeb
-s ours am: e688963174
-s ours
...
am: c3e81eb7d2
-s ours
Change-Id: Id81ef6e92fa0eaebc8d49dc0249d2d133ff3ee4e
2017-07-26 22:16:44 +00:00
Bill Yi
216737e6f7
Import translations. DO NOT MERGE am: 03907bdaeb
-s ours am: e688963174
-s ours
...
am: 301645fdf5
-s ours
Change-Id: I793d44610630bb016868da8f99fa413dd68cd458
2017-07-26 22:09:59 +00:00
Bill Yi
c813e90ef2
Import translations. DO NOT MERGE am: 03907bdaeb
-s ours am: e688963174
-s ours
...
am: c3e81eb7d2
-s ours
Change-Id: I0d4709ec6d29fab716e560b3699784f8cc2fc2ba
2017-07-26 22:09:38 +00:00
Bill Yi
c3e81eb7d2
Import translations. DO NOT MERGE am: 03907bdaeb
-s ours
...
am: e688963174
-s ours
Change-Id: Icd0cd7480d2692272c8ddebd6e8fb94d1bb0fcc9
2017-07-26 22:03:00 +00:00
Bill Yi
301645fdf5
Import translations. DO NOT MERGE am: 03907bdaeb
-s ours
...
am: e688963174
-s ours
Change-Id: Ib8cf3c801dbb33ba99cbe8dd38e1f0d0dcc56b4f
2017-07-26 22:02:58 +00:00
TreeHugger Robot
01422e1ff5
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-07-26 22:01:56 +00:00
Bill Yi
e688963174
Import translations. DO NOT MERGE
...
am: 03907bdaeb
-s ours
Change-Id: I5a88544c53e5411b1234bd5fad0c1408141a62ec
2017-07-26 21:56:09 +00:00
Dan Willemsen
da16b03b60
Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9
am: 5977a3cb18
am: 5c223f1b0b
...
am: ef9a07958f
Change-Id: I8a6fa664e6e1ef439b02ac22883318a1f328a4e7
2017-07-26 21:03:43 +00:00
Dan Willemsen
ef9a07958f
Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9
am: 5977a3cb18
...
am: 5c223f1b0b
Change-Id: I1e2f47b4cbedc7d1a49c33620d0ac4feba97c29f
2017-07-26 20:49:55 +00:00
Dan Willemsen
5c223f1b0b
Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9
...
am: 5977a3cb18
Change-Id: I5b60ba77c77a8e635cfc1f495f07b217eb486cee
2017-07-26 20:45:56 +00:00
Dan Willemsen
5977a3cb18
Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION"
...
am: 3669fbc4c9
Change-Id: Ibfbc1f11eac0870a5eec7211c868fdcb38f395e0
2017-07-26 20:42:35 +00:00
Treehugger Robot
3669fbc4c9
Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION"
2017-07-26 20:26:31 +00:00
Bill Yi
03907bdaeb
Import translations. DO NOT MERGE
...
Change-Id: I83d6d6794644e7bf00bcd3e9d24f801dd0f26ec7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 11:28:31 -07:00
Bill Yi
cd23c7560e
Import translations. DO NOT MERGE
...
Change-Id: Ie2ee3d601e39084145911761b1204e5f4cafd219
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 11:28:18 -07:00
Dan Willemsen
6e29475b9f
Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION
...
This builds on Darwin fine, so remove the non-standard darwin checks.
Remove HOST_JDK_IS_64BIT_VERSION, it's always true now, and this is the
only user.
Test: mmm packages/inputmethods/LatinIME/tools/dicttool:liblatinime-aosp-dicttool-host
Change-Id: I750c6baa29cf1d27a885ff064f0daf9d986db0b9
2017-07-26 10:59:15 -07:00