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
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
Bill Yi
5ef922800e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: Id8b1086d2959c82b9bf0501b2ec09f4f06f92a59
2016-11-20 17:01:28 -08:00
Bill Yi
9be2112b57
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: I8bfdbfaafe7be003828ac6994781ccffd90310f1
2016-11-20 17:00:47 -08:00
Bill Yi
1e7141667f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: I63f2e9abe968d6a37abef2f6bc3cc200e9a669a8
2016-11-20 16:59:46 -08:00
Bill Yi
1834716f17
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: Ia09fe3c77df78cc2ae3cbf4bd3890295351ba15e
2016-11-20 16:59:11 -08:00
Bill Yi
6da15efecc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: Iee950938a55411791e85a59bf4b91dc7f5cd6df4
2016-11-20 16:58:29 -08:00
Elliott Hughes
7d3f1341be
Merge "Rely on the platform -std default." am: d2af70179e
am: 7493c3bc60
...
am: e39fa388bf
Change-Id: I730e0a50202cba9077775cb89ff9b9af1c7158fc
2016-10-08 21:58:08 +00:00
Elliott Hughes
e39fa388bf
Merge "Rely on the platform -std default." am: d2af70179e
...
am: 7493c3bc60
Change-Id: Ia93ef1c3151c9bd2dd7881142639aae2527bea87
2016-10-08 21:53:08 +00:00
Elliott Hughes
7493c3bc60
Merge "Rely on the platform -std default."
...
am: d2af70179e
Change-Id: Iebe15bbb8e8a6412d777ff305f2f4d4aa9c8724e
2016-10-08 21:48:37 +00:00
Treehugger Robot
d2af70179e
Merge "Rely on the platform -std default."
2016-10-08 21:45:01 +00:00
Elliott Hughes
8fd22fa494
Rely on the platform -std default.
...
Bug: http://b/32019064
Test: builds
Change-Id: I17611b6d9598992bd52cf3dc93509f0f5e0bdcde
2016-10-07 15:41:05 -07:00
Bill Yi
3152809d46
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 9f7b9a8352
-s ours am: 07225a0fa0
-s ours
...
am: ef47d17d89
-s ours
Change-Id: Iedbefd905c76643392aa73f104d0dc4b2523e9c6
2016-09-17 03:23:08 +00:00
Bill Yi
29ab728a1a
Import translations. DO NOT MERGE am: 99edf007c5
-s ours am: 0dc385de80
-s ours
...
am: 3fc43040fd
-s ours
Change-Id: Iff54746796ef50f468eb6fed3bfac2951d2ac168
2016-09-17 03:22:52 +00:00
Bill Yi
b312dc28b0
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 46aaf3e039
-s ours am: f33988386b
-s ours
...
am: ebd92fbe75
-s ours
Change-Id: If561d2d9a2ed14e97f7c5570b53ff744fafa7981
2016-09-17 03:22:34 +00:00
Bill Yi
3379248ac8
Import translations. DO NOT MERGE am: 5062034c28
-s ours am: 0de320c5c0
-s ours
...
am: 10362dda16
-s ours
Change-Id: I69991570d2517e6b8e1141fd89c292032aca2d1b
2016-09-17 03:22:12 +00:00
Bill Yi
8c5cdac712
Import translations. DO NOT MERGE am: 765fb96508
-s ours am: b9ea5983ae
-s ours
...
am: 5b754abbf2
-s ours
Change-Id: I48c03295e7e05b95f07480775045cd45a6f7e386
2016-09-17 03:21:50 +00:00
Bill Yi
ef47d17d89
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 9f7b9a8352
-s ours
...
am: 07225a0fa0
-s ours
Change-Id: I8cb8a8845afb2139cb359dd6e96e3a34089092df
2016-09-17 03:20:18 +00:00
Bill Yi
3fc43040fd
Import translations. DO NOT MERGE am: 99edf007c5
-s ours
...
am: 0dc385de80
-s ours
Change-Id: I8642efe22ad525c15ef1657a7fed4b407a309fd6
2016-09-17 03:19:59 +00:00
Bill Yi
ebd92fbe75
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 46aaf3e039
-s ours
...
am: f33988386b
-s ours
Change-Id: Ib5b85699bb848c1b495d54f3350bd7cd3acb5cc5
2016-09-17 03:19:36 +00:00
Bill Yi
10362dda16
Import translations. DO NOT MERGE am: 5062034c28
-s ours
...
am: 0de320c5c0
-s ours
Change-Id: Ib9ae5cc81c679a56b84a44394342973d8441cfc9
2016-09-17 03:19:10 +00:00
Bill Yi
5b754abbf2
Import translations. DO NOT MERGE am: 765fb96508
-s ours
...
am: b9ea5983ae
-s ours
Change-Id: If4ad7ee2b249565b9aa89147e025bfd4c4fe8f07
2016-09-17 03:18:53 +00:00
Bill Yi
07225a0fa0
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
...
am: 9f7b9a8352
-s ours
Change-Id: I0d416f02b34a16347eb2a25c83301ff2a394890e
2016-09-17 03:17:19 +00:00
Bill Yi
0dc385de80
Import translations. DO NOT MERGE
...
am: 99edf007c5
-s ours
Change-Id: I86995c4cce7d526a9f2fce47bbc84640a41b5ab0
2016-09-17 03:17:17 +00:00
Bill Yi
f33988386b
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
...
am: 46aaf3e039
-s ours
Change-Id: I1b03ec696e9588055c19fee8eb524c82f307c102
2016-09-17 03:16:49 +00:00
Bill Yi
0de320c5c0
Import translations. DO NOT MERGE
...
am: 5062034c28
-s ours
Change-Id: Idb00741439213128dd6e3d5cd6721cb9c39647dc
2016-09-17 03:16:47 +00:00
Bill Yi
b9ea5983ae
Import translations. DO NOT MERGE
...
am: 765fb96508
-s ours
Change-Id: I68102c55e0859e7d4a284cb45f34051bca12efd3
2016-09-17 03:16:23 +00:00