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
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
TreeHugger Robot
8181498163
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-30 21:54:33 +00:00
TreeHugger Robot
64e0910859
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-30 21:45:14 +00:00
TreeHugger Robot
698db8cba9
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-30 21:45:12 +00:00
TreeHugger Robot
f7fe0be6a2
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-30 21:42:41 +00:00
TreeHugger Robot
80eee73afb
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-30 21:41:56 +00:00
TreeHugger Robot
b10be9d131
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-30 21:40:28 +00:00
Bill Yi
a8709c37dc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: Ib777b462a9e91772e41e93ab27516258b2a9e5da
2016-06-30 14:07:06 -07:00
Bill Yi
6c6935c024
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I00e4356f390a9017bb2b569b90ad9f69d7e8ea5f
2016-06-30 14:01:54 -07:00
Bill Yi
5fcbf4a2af
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I98cf6044cc5cc77549ae595a2b2d543a797da627
2016-06-30 14:00:45 -07:00
Bill Yi
dda02f3028
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I1f8a50df1ce01540b627e24fd5c4995af9b4d582
2016-06-30 14:00:02 -07:00
Bill Yi
17ee212415
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: Icedecf2e1ac22b02d29d11d93980499c90bc82ba
2016-06-30 13:58:55 -07:00
Bill Yi
a8e2a7d8ec
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I7b096bdfa2cbea48f9474d04ab03f175720ed8db
2016-06-30 13:58:19 -07:00
Bill Yi
6da7ea4dfd
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I11c592e3a9bc4f47b7438f55b3c46968b0befe2f
2016-06-30 13:57:35 -07:00
Bill Yi
721e972633
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
...
am: 2ebc49de87
-s ours
Change-Id: I56a11d5e529d87205c1be5a18bd6af78e695ab6a
2016-06-17 04:49:39 +00:00
Bill Yi
2ebc49de87
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-17 04:43:03 +00:00
Bill Yi
66299ffce0
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
...
am: 0b82b53b82
-s ours
Change-Id: I6191fe0a0b48508149189c391f106d9783f8ffd2
2016-06-17 04:30:42 +00:00
Bill Yi
0b82b53b82
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-17 04:14:33 +00:00
Bill Yi
ca24f0f89b
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
...
am: 464f60e489
-s ours
Change-Id: Ied3b03a39ae0ef882dbac8c8f7dcf62587056e1f
2016-06-17 00:04:08 +00:00
Bill Yi
db31f709f1
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
...
am: c228036f0a
-s ours
Change-Id: Ia9551bd60a73a4eb1286931505183a3e25d29d29
2016-06-17 00:04:08 +00:00
Bill Yi
54f2d178f6
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
...
am: c6a6ef7e38
-s ours
Change-Id: I0217358393d1ac6888cb5ef130a2e20ec3861c8c
2016-06-17 00:04:07 +00:00
Bill Yi
982b7c6e75
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
...
am: ff25e24e6e
-s ours
Change-Id: Idc0df1c8e29b307f4c3b4e6b8a1c051d22e75db0
2016-06-17 00:04:07 +00:00
Bill Yi
e05c6051dd
Import translations. DO NOT MERGE
...
am: 533e2a4716
-s ours
Change-Id: I540a437deb5400db44278aaf82da90a7cdf23efc
2016-06-17 00:04:06 +00:00
Bill Yi
464f60e489
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-16 23:53:46 +00:00
Bill Yi
c228036f0a
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-16 23:53:18 +00:00
Bill Yi
c6a6ef7e38
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-16 23:52:53 +00:00
Bill Yi
ff25e24e6e
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-06-16 23:52:08 +00:00
Bill Yi
3098987d22
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I61ad4698f55cd417436964c0c5f4b4da4f1bcd10
2016-06-16 15:31:52 -07:00
Bill Yi
b7f7fa21e3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: Ibe0e6a2475477629e040091d85e24172472ce65a
2016-06-16 15:26:44 -07:00
Bill Yi
0a4e6f1a1c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I8d0013c3160c926d74ba733696d84f7326593ff2
2016-06-16 15:25:35 -07:00
Bill Yi
f444fa5066
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I965f52a8667f9124f0c36fc5d64690711449beb3
2016-06-16 15:24:54 -07:00
Bill Yi
365c469db4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I6c9b37df645efe14ec0411447c06d881c950c1ee
2016-06-16 15:23:49 -07:00
Bill Yi
237326066e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I7de552e1348950d973dcc968c968b6fe0fe6ad35
2016-06-16 15:23:14 -07:00
Bill Yi
533e2a4716
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29390361
Change-Id: I39b17865381aa3aa8e5eb1cdd68685aadd533d28
2016-06-16 15:22:29 -07:00
Baligh Uddin
2330bda48b
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: dbfd3a837e
-s ours
Change-Id: Ica49d61f60c86b0df9c7e1ad0a55b3d09e6ca7e5
2016-06-08 13:36:58 +00:00
Baligh Uddin
bed7b147cf
Import translations. DO NOT MERGE
...
am: 5c8db18dd1
-s ours
Change-Id: I489a86c2712fe9e484a30c23a0d1cb99812569e7
2016-06-08 13:36:57 +00:00
Baligh Uddin
dbfd3a837e
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:09:19 +00:00
Baligh Uddin
5c8db18dd1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: If935daca902ebe248116fc37921c8c0055927336
2016-06-07 21:50:30 -07:00
Baligh Uddin
50f6503a8d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: I15d8ac243062446fe14870a034e27d29dc0f7a6f
2016-06-07 21:42:31 -07:00
Bill Yi
b8d309d8c4
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 33793c58fa
-s ours
* commit '33793c58fae2660cd4270bc0644c4431c50d2b69':
Import translations. DO NOT MERGE
Change-Id: I7faf31b361d1444424f976c206fb09b08fdee324
2016-06-03 21:21:15 +00:00
Bill Yi
4d875b8b49
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: cb204b98d5
-s ours
* commit 'cb204b98d56bd25cd336fe7b3715bbb019c821af':
Import translations. DO NOT MERGE
Change-Id: I11964b2a7788bbcc85a5c5b8d3e84acd77a8116d
2016-06-03 21:15:59 +00:00
Bill Yi
b1aa8909d0
Import translations. DO NOT MERGE
...
am: c577c5919b
-s ours
* commit 'c577c5919b44e5fe410979e49573d642c76ed17d':
Import translations. DO NOT MERGE
Change-Id: I7fba3a49be60057c0a30898adbd0b55be928ca33
2016-06-03 21:13:36 +00:00
Bill Yi
e75020ebb4
Import translations. DO NOT MERGE
...
am: 9234d88740
-s ours
* commit '9234d887408e14e5d9ebae64da740f99185092e3':
Import translations. DO NOT MERGE
Change-Id: Ic1835ebe83d8d2dc9fb07aee219657a7912bb157
2016-06-03 21:11:10 +00:00
TreeHugger Robot
33793c58fa
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-03 20:41:38 +00:00
TreeHugger Robot
cb204b98d5
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-03 20:35:13 +00:00
TreeHugger Robot
c577c5919b
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-03 20:23:36 +00:00
Bill Yi
b872644456
Import translations. DO NOT MERGE
...
Change-Id: I134cd96dd97b042c3ce720fa05b685964534d41f
Auto-generated-cl: translation import
2016-06-03 11:55:09 -07:00
Bill Yi
80529c34f4
Import translations. DO NOT MERGE
...
Change-Id: I5b67a347d3955764ff2ec6fa124629c13393fb28
Auto-generated-cl: translation import
2016-06-03 11:48:43 -07:00