Commit graph

41294 commits

Author SHA1 Message Date
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
Bill Yi
8d5dd94012 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0ca0ed10c3 -s ours
am: 56fbe87528  -s ours

Change-Id: I0dd8b126c8f19fc76e1c0e130d7c168a357657ff
2018-10-13 20:03:18 -07:00
Bill Yi
475c709c86 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f1e3e4c5a8 -s ours
am: 221b18b183  -s ours

Change-Id: I2de320b945d079447005ae94836b417bdbbabecc
2018-10-13 20:03:03 -07:00
Bill Yi
0ffb993c64 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 051ebe1f67 -s ours
am: 3bd0ac6a1e  -s ours

Change-Id: I4f35146a88e4c59e61d3ee504fc63cd39180b2d5
2018-10-13 20:02:49 -07:00
Bill Yi
8a089d2cfa [automerger skipped] Import translations. DO NOT MERGE am: 4f8a5c0dd6 -s ours
am: 50989e70dd  -s ours

Change-Id: If413987720612c739c51fe1de891f26296b1f6bc
2018-10-13 20:02:34 -07:00
Bill Yi
6141ad5079 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: fe42418de4  -s ours

Change-Id: I04ccad51a0335212a71a0b9045a2eea6ba9495f1
2018-10-13 19:59:49 -07:00
Bill Yi
cf6ae73d4c [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 5958fb4cbc  -s ours

Change-Id: Ie64b997b3cb56737b62bdb84d6d68ed21e37f525
2018-10-13 19:59:34 -07:00
Bill Yi
56fbe87528 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0ca0ed10c3  -s ours

Change-Id: I7e40179518929c497f9eb88495bd7478cc3dbd00
2018-10-13 19:59:19 -07:00
Bill Yi
221b18b183 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: f1e3e4c5a8  -s ours

Change-Id: If15f3fcb0f5857b719a7f2c9799d775c6cd2896c
2018-10-13 19:59:04 -07:00
Bill Yi
3bd0ac6a1e [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 051ebe1f67  -s ours

Change-Id: I357d322111f9d35c1c37be17debda50e94b26e41
2018-10-13 19:58:48 -07:00
Bill Yi
50989e70dd [automerger skipped] Import translations. DO NOT MERGE
am: 4f8a5c0dd6  -s ours

Change-Id: I2e91fa4b3c5f7d821f011f1da1842283484fe9df
2018-10-13 19:58:31 -07:00
TreeHugger Robot
fe42418de4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:56 +00:00
TreeHugger Robot
5958fb4cbc Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:54 +00:00
TreeHugger Robot
0ca0ed10c3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:35 +00:00
TreeHugger Robot
f1e3e4c5a8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:46:38 +00:00
TreeHugger Robot
051ebe1f67 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:44:16 +00:00
Bill Yi
54e8416096 Import translations. DO NOT MERGE
Change-Id: Id26d6b48ca52c631b3f2041682663f07b49e4b80
Auto-generated-cl: translation import
2018-10-13 08:35:07 -07:00
Bill Yi
946631933a Import translations. DO NOT MERGE
Change-Id: I76dbccb4e65ebb99db55049222d6fe361d08d9fc
Auto-generated-cl: translation import
2018-10-13 08:34:10 -07:00
Bill Yi
b0fc52fca9 Import translations. DO NOT MERGE
Change-Id: I0606bc4b8d8c37ef386f1af4764a6887b86017f5
Auto-generated-cl: translation import
2018-10-13 08:32:35 -07:00
Bill Yi
4f8a5c0dd6 Import translations. DO NOT MERGE
Change-Id: Id8ca0f5d84e52df495611542f8c52e63329d531a
Auto-generated-cl: translation import
2018-10-13 08:31:41 -07:00
Bill Yi
819b30680c Import translations. DO NOT MERGE
Change-Id: I915ddb171c85d7f9f1428bb52e60727a9e254a60
Auto-generated-cl: translation import
2018-10-13 08:30:21 -07:00
Bill Yi
3725a3fbca Import translations. DO NOT MERGE
Change-Id: I521ffadf560fd919a12387844ba6799a024884b1
Auto-generated-cl: translation import
2018-10-13 08:28:46 -07:00
Paul Duffin
14720ca8cb Remove paulduffin@ from OWNERS
Test: n/a
Change-Id: I24503d403feefbed40475660983493fb2991d9a8
2018-10-10 16:15:41 +01:00