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
1a4053f540
Import translations. DO NOT MERGE
...
Change-Id: I572a9003be1ce0dc4cb02de17c066ef329ad4913
Auto-generated-cl: translation import
2016-11-28 21:08:58 -08:00
Bill Yi
4e26fe30c9
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 634fc5a417
-s ours am: efa89be550
-s ours
...
am: 2e570aae72
-s ours
Change-Id: Iab41fe2f86255e0ac6f174a3b121cc850d8a13e7
2016-11-21 02:49:34 +00:00
Bill Yi
ab83a898e9
Import translations. DO NOT MERGE am: 11443a10b9
-s ours am: 3bbc35a294
-s ours
...
am: 4dca30a227
-s ours
Change-Id: I1aadc42e792f3d8853cdfd1330b036687dd5e172
2016-11-21 02:49:20 +00:00
Bill Yi
b4958f714b
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 60a9f4ca18
-s ours am: e869c4ef32
-s ours
...
am: b2bce8b718
-s ours
Change-Id: I88e26246ac6f5b6caeed5a9a53c63c232addceb1
2016-11-21 02:49:05 +00:00
Bill Yi
e226ac84be
Import translations. DO NOT MERGE am: e8b1aebb88
-s ours am: 489f0674c8
-s ours
...
am: d3e14b8420
-s ours
Change-Id: Iaf34e2f11db0d4130a3335b5143abd6347f1d8bf
2016-11-21 02:48:51 +00:00
Bill Yi
9bcd344ee3
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ffefbfdb9d
-s ours am: 630fac14b8
-s ours
...
am: cfcd277022
-s ours
Change-Id: I08ea86978c0eee05d3edde8e07b332e1bb46a643
2016-11-21 02:48:36 +00:00
Bill Yi
0ea92e0e06
Import translations. DO NOT MERGE am: 6da15efecc
-s ours am: bed39c40ee
-s ours
...
am: 14bd1b3c7c
-s ours
Change-Id: Ic26ac8864fc45bad9d27e4d5d5c7c9efe96fbf87
2016-11-21 02:48:21 +00:00
Bill Yi
629d4eb16b
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e6d2b89ce3
-s ours am: 01d3fde036
-s ours
...
am: f73f2bd9c5
-s ours
Change-Id: I8cf6161ca539046f0ed6566366dc2f556c686282
2016-11-21 02:48:07 +00:00
Bill Yi
f744475055
Import translations. DO NOT MERGE am: 5ef922800e
-s ours am: 11a1ebd4da
-s ours
...
am: ff7812de7c
-s ours
Change-Id: I824076eca045921d83fd655b13df69b6b8ced4e0
2016-11-21 02:47:53 +00:00
Bill Yi
a0a485a035
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 417d745e6d
-s ours am: f642db22e1
-s ours
...
am: 30490326a6
-s ours
Change-Id: I055b1687c51a7dda29dd25dbce59a1b09454c934
2016-11-21 02:47:38 +00:00
Bill Yi
8767499c02
Import translations. DO NOT MERGE am: 1e7141667f
-s ours am: df37d62628
-s ours
...
am: aa0a5d6e25
-s ours
Change-Id: I8507037a67f1506008899727a0eb6c804ca187ca
2016-11-21 02:47:23 +00:00
Bill Yi
aabd977a20
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: abfce3ccd8
-s ours am: 2ceb4450ae
-s ours
...
am: d443682c5f
-s ours
Change-Id: I9fd9882253538881db56a5986f50757af2fe3e25
2016-11-21 02:47:07 +00:00
Bill Yi
e3f02d6916
Import translations. DO NOT MERGE am: 1834716f17
-s ours am: 28255a7813
-s ours
...
am: 90051a1b11
-s ours
Change-Id: Ia8e7085f18b78e9864204fc403ad390d8894081f
2016-11-21 02:46:52 +00:00
Bill Yi
4fe3657c85
Import translations. DO NOT MERGE am: 9be2112b57
-s ours am: 2729361edd
-s ours
...
am: 6d4b3a0280
-s ours
Change-Id: I542ce22553432a89b3955db845cca36cb9280be2
2016-11-21 02:46:37 +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
TreeHugger Robot
417d745e6d
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-11-21 01:39:34 +00:00
TreeHugger Robot
abfce3ccd8
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-11-21 01:33:43 +00:00
Bill Yi
e8b1aebb88
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: I813a327d9361336da3ea4aac39a6ef0b345263af
2016-11-20 17:07:47 -08:00
Bill Yi
11443a10b9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: Ib276271b318f0e132d02ee9426b5fb5c57e1187f
2016-11-20 17:02:31 -08:00