Commit graph

39552 commits

Author SHA1 Message Date
Bill Yi
fb431861f0 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: f304362edc  -s ours

Change-Id: I03a819a1f7f66d69b429e30ec02b3bcd3444150c
2017-02-16 15:50:04 +00:00
Bill Yi
928988f12e Import translations. DO NOT MERGE
am: 4cf3910930  -s ours

Change-Id: I7745da480f983d2e46b8e7b4e9bbeefd1ab8cc9b
2017-02-16 15:49:51 +00:00
TreeHugger Robot
f304362edc Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-16 15:44:48 +00:00
Bill Yi
7e02846f06 Import translations. DO NOT MERGE
Change-Id: I65cc4ee1caea5d9d8e9a704549175e52611ba0b9
Auto-generated-cl: translation import
2017-02-15 17:46:19 -08:00
Bill Yi
4cf3910930 Import translations. DO NOT MERGE
Change-Id: If68282123e97f900198a68725a1a98dc633115b7
Auto-generated-cl: translation import
2017-02-15 17:29:43 -08:00
Bill Yi
3b34a40c74 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 384007ac74  -s ours

Change-Id: I535ef14456b854ca70b6dac5705e3d5024106ecb
2017-02-03 08:37:34 +00:00
Bill Yi
a7290ad7ea Import translations. DO NOT MERGE
am: dd6d694fcb  -s ours

Change-Id: I5060d6560e5e72a402cec4f43b848cc05ca32c71
2017-02-03 08:37:33 +00:00
Bill Yi
6fd8b916aa Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 7dbc639446  -s ours

Change-Id: I6da3efc5551a2e7c3d6077588e1529366620f26f
2017-02-03 08:37:16 +00:00
Bill Yi
28f6dcc8ef Import translations. DO NOT MERGE
am: 2b39ab6454  -s ours

Change-Id: Ic4828b1300d4a298b4e7ab5d590f28cff7e6b1a5
2017-02-03 08:37:14 +00:00
TreeHugger Robot
384007ac74 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:27:07 +00:00
TreeHugger Robot
7dbc639446 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-03 08:18:50 +00:00
Bill Yi
331ef5f593 Import translations. DO NOT MERGE
am: 99348c75da  -s ours

Change-Id: I5183ee927d1bd4055c15d4e8434aa58f0393dc2d
2017-02-03 08:10:41 +00:00
Bill Yi
2b39ab6454 Import translations. DO NOT MERGE
Change-Id: I9a224565bb46caa20ead911a74702c773ea2a282
Auto-generated-cl: translation import
2017-02-02 22:46:47 -08:00
Bill Yi
dd6d694fcb Import translations. DO NOT MERGE
Change-Id: I7796f5a735a49337ada20e07143db34574a40017
Auto-generated-cl: translation import
2017-02-02 22:39:50 -08:00
Bill Yi
99348c75da Import translations. DO NOT MERGE
Change-Id: I81c09641bd1dd7c3366bb9de425888c0f536763e
Auto-generated-cl: translation import
2017-02-02 22:39:00 -08:00
Paul Duffin
2cb8e19413 Merge "Use junit-host instead of junit" am: 8293d4f266 am: e4ea7e8191
am: 17a53d5e94

Change-Id: I0592babdb41bcb9ee4110c3b6ba67787699d0959
2016-11-30 13:44:29 +00:00
Paul Duffin
17a53d5e94 Merge "Use junit-host instead of junit" am: 8293d4f266
am: e4ea7e8191

Change-Id: If20a9b9cf3df8b512a9f802d940383fba77b5ad6
2016-11-30 13:39:59 +00:00
Paul Duffin
e4ea7e8191 Merge "Use junit-host instead of junit"
am: 8293d4f266

Change-Id: Ic5bb8ac0b30e42bb30952569f49cc74705f036c9
2016-11-30 13:34:27 +00:00
Paul Duffin
8293d4f266 Merge "Use junit-host instead of junit" 2016-11-30 13:27:38 +00:00
Paul Duffin
982f0fa29f Use junit-host instead of junit
Use framework/junit-host.jar instead of framework/junit.jar

Ran the script before and after making the change and it failed
in the same way with a build error but it was not due to a
problem with JUnit.

Bug: 30188076
Test: make checkbuild and ran the test-dicttool.sh script
Change-Id: I4cdd518f38184ff3ade5a06d968d6902770ece6b
2016-11-30 11:24:59 +00:00
Bill Yi
2e570aae72 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 634fc5a417 -s ours
am: efa89be550  -s ours

Change-Id: I5706d06d3c022bf56c9f7f6a5c2a6ebc8a80646c
2016-11-21 02:28:28 +00:00
Bill Yi
4dca30a227 Import translations. DO NOT MERGE am: 11443a10b9 -s ours
am: 3bbc35a294  -s ours

Change-Id: I15b2b4c3acbb28014f01af559ae2d62ab5ac77d1
2016-11-21 02:28:12 +00:00
Bill Yi
b2bce8b718 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 60a9f4ca18 -s ours
am: e869c4ef32  -s ours

Change-Id: I7292fed672e9a19f5d1777dc3f52d05735d797db
2016-11-21 02:27:58 +00:00
Bill Yi
d3e14b8420 Import translations. DO NOT MERGE am: e8b1aebb88 -s ours
am: 489f0674c8  -s ours

Change-Id: Ic068960e0e7b935b943964d87bebda716ee2a770
2016-11-21 02:27:45 +00:00
Bill Yi
cfcd277022 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ffefbfdb9d -s ours
am: 630fac14b8  -s ours

Change-Id: I1df41a9ac5d9cf4b8674c4f9ade533764fc7a0b4
2016-11-21 02:27:31 +00:00
Bill Yi
14bd1b3c7c Import translations. DO NOT MERGE am: 6da15efecc -s ours
am: bed39c40ee  -s ours

Change-Id: I7274e1eb0f992bfccdc219b16c27f4b85b9cffd2
2016-11-21 02:27:17 +00:00
Bill Yi
f73f2bd9c5 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e6d2b89ce3 -s ours
am: 01d3fde036  -s ours

Change-Id: I4fd1d32c2bb9321683879d1b96623b2658cf7775
2016-11-21 02:27:02 +00:00
Bill Yi
ff7812de7c Import translations. DO NOT MERGE am: 5ef922800e -s ours
am: 11a1ebd4da  -s ours

Change-Id: Ib303ee920077a3d390b4e8ea5fe02de2f565842c
2016-11-21 02:26:48 +00:00
Bill Yi
30490326a6 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 417d745e6d -s ours
am: f642db22e1  -s ours

Change-Id: I3143f7e9a2124e658717081e720945f826a6ce00
2016-11-21 02:26:33 +00:00
Bill Yi
aa0a5d6e25 Import translations. DO NOT MERGE am: 1e7141667f -s ours
am: df37d62628  -s ours

Change-Id: Ic40bef3a9a5a8d9797493ce274b042009056e8d4
2016-11-21 02:26:18 +00:00
Bill Yi
d443682c5f Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: abfce3ccd8 -s ours
am: 2ceb4450ae  -s ours

Change-Id: I6cb867e68f1c64ac1620171a99df4c0e001480ec
2016-11-21 02:26:04 +00:00
Bill Yi
90051a1b11 Import translations. DO NOT MERGE am: 1834716f17 -s ours
am: 28255a7813  -s ours

Change-Id: I6392cf009bf3b6731e8e28b13cd13e598600857e
2016-11-21 02:25:48 +00:00
Bill Yi
6d4b3a0280 Import translations. DO NOT MERGE am: 9be2112b57 -s ours
am: 2729361edd  -s ours

Change-Id: I93b8c8fcdafbecef65674779e5817d1677782fc5
2016-11-21 02:25:34 +00:00
Bill Yi
efa89be550 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 634fc5a417  -s ours

Change-Id: Ib385da702d6b94aba349f39b8c84e728573e416b
2016-11-21 02:05:51 +00:00
Bill Yi
3bbc35a294 Import translations. DO NOT MERGE
am: 11443a10b9  -s ours

Change-Id: Ifae68ac6f58c78267743bcb214aac09ddef0afae
2016-11-21 02:05:50 +00:00
Bill Yi
e869c4ef32 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 60a9f4ca18  -s ours

Change-Id: I799138b6ee168bb2ce217475ce252921b8925c52
2016-11-21 02:05:24 +00:00
Bill Yi
489f0674c8 Import translations. DO NOT MERGE
am: e8b1aebb88  -s ours

Change-Id: Ib037075c687f622e9dfe6ca64173d3316674121c
2016-11-21 02:05:22 +00:00
Bill Yi
630fac14b8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ffefbfdb9d  -s ours

Change-Id: Ifd52d59dd56df8a4a756929a2c17b6dc65183f0b
2016-11-21 02:04:59 +00:00
Bill Yi
bed39c40ee Import translations. DO NOT MERGE
am: 6da15efecc  -s ours

Change-Id: Ib85e72286f3cdbd05fa5ba8798dc7a5cff3a6543
2016-11-21 02:04:57 +00:00
Bill Yi
01d3fde036 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: e6d2b89ce3  -s ours

Change-Id: I1a2ac70bf62670f8f6da2365d2e4bc1fe502c099
2016-11-21 02:04:34 +00:00
Bill Yi
11a1ebd4da Import translations. DO NOT MERGE
am: 5ef922800e  -s ours

Change-Id: I614d0185f5fb5ad1f8df96cb7aadf4e7dc6279ac
2016-11-21 02:04:33 +00:00
Bill Yi
f642db22e1 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 417d745e6d  -s ours

Change-Id: Ic677a160062156ebc625cbd3788781be6a826959
2016-11-21 02:04:06 +00:00
Bill Yi
df37d62628 Import translations. DO NOT MERGE
am: 1e7141667f  -s ours

Change-Id: Icd105089195ebe121b1ac9d82d056865c6999d2a
2016-11-21 02:04:05 +00:00
Bill Yi
2ceb4450ae Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: abfce3ccd8  -s ours

Change-Id: I5fe046b806d8189ab067db009b2168d2eceade3b
2016-11-21 02:03:43 +00:00
Bill Yi
28255a7813 Import translations. DO NOT MERGE
am: 1834716f17  -s ours

Change-Id: I294bb43be00d0a603f183c09e05f58c6903fd946
2016-11-21 02:03:42 +00:00
Bill Yi
2729361edd Import translations. DO NOT MERGE
am: 9be2112b57  -s ours

Change-Id: I04318b8ed676b3fed71220b2b9815928b8278a35
2016-11-21 02:03:25 +00:00
TreeHugger Robot
634fc5a417 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:48:32 +00:00
TreeHugger Robot
60a9f4ca18 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:48:05 +00:00
TreeHugger Robot
ffefbfdb9d Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:42:53 +00:00
TreeHugger Robot
e6d2b89ce3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:42:00 +00:00