nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
39,576 Commits
1 Branch
0 Tags
363 MiB
Commit Graph

39576 Commits (5151513a15f55677de0398972f7a679808bed58b)

Author SHA1 Message Date
Paul Duffin 5151513a15 Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 83f0d8dc18 
am: 341a052cf9

Change-Id: I32b078a3fbb028bf9f925be3613287ba2bbd9a0d
 2017-05-08 20:14:35 +00:00
Paul Duffin 341a052cf9 Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" 
am: 83f0d8dc18

Change-Id: If0e4bdafb4e4451315b5a7270cfe9526d65b38f4
 2017-05-08 20:05:51 +00:00
Paul Duffin 83f0d8dc18 Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" 2017-05-08 19:54:38 +00:00
Paul Duffin ddc9c28ca8 Prepare for removal of junit and android.test classes from Android API (step 1) 
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: I160c136ecd1089a2b13d5cdba9eee1287aad93f9
Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2
 2017-05-08 15:35:04 +01:00
Bill Yi 84e782d4d1 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: f58518ea9c  -s ours

Change-Id: I1980105f452b67b4fd87d331e27452805f72f7c8
 2017-04-03 02:21:09 +00:00
Bill Yi f58518ea9c Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-03 02:12:14 +00:00
Bill Yi 593bf07724 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 76116a45b7  -s ours

Change-Id: Icb8bc8924865fd894c020441863d0cba4ccf4730
 2017-04-02 08:31:28 +00:00
Bill Yi cb19e71124 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 7cf67d843c  -s ours

Change-Id: I17724c446841088e5298753ffbd9499e51a46bd3
 2017-04-02 08:31:16 +00:00
TreeHugger Robot 76116a45b7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:25:20 +00:00
TreeHugger Robot 7cf67d843c Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:25:15 +00:00
Bill Yi 3b5113a48d Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: fdd8c4bbee  -s ours

Change-Id: Ic76163052cc3d38d550830e6da9cbc2c4ad8147b
 2017-04-02 08:22:40 +00:00
Bill Yi d72478519e Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: dfd4523ad3  -s ours

Change-Id: I77e69494ee00130c10dfd861669c284464e1e09e
 2017-04-02 08:22:28 +00:00
Bill Yi 4e1a184db2 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 3d0304f5b6  -s ours

Change-Id: Iadb9fa7145766d6b9ef7762fcc06d60b52bd7bfa
 2017-04-02 08:22:16 +00:00
TreeHugger Robot fdd8c4bbee Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:20:25 +00:00
TreeHugger Robot dfd4523ad3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:18:34 +00:00
Bill Yi 0e520461e6 Import translations. DO NOT MERGE 
am: d860ee678b  -s ours

Change-Id: I1106479189a59931c81d005d6412cf3adf4cc3b3
 2017-04-02 08:18:28 +00:00
TreeHugger Robot 3d0304f5b6 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 08:18:19 +00:00
Bill Yi d860ee678b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I33c7a3e55084f5f827b1833fed0142e800a38950
 2017-04-02 00:32:09 -07:00
Bill Yi 29cce21e61 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I6b9237cb556259ed9803ae1bef977d284d93d618
 2017-04-02 00:26:01 -07:00
Bill Yi f382c4e096 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I383339746de9527c4a03e2e73697771f9c2310da
 2017-04-02 00:24:59 -07:00
Bill Yi feb7f2e702 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I6f0c71c1cf7d5fda940bcc2a164ccef590d1db4d
 2017-04-02 00:24:17 -07:00
Bill Yi 81eb1564c0 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ia1da75e3245c7fd496cf2874661b52a32ca24fd1
 2017-04-02 00:23:17 -07:00
Bill Yi 10a4a49b98 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I445089565caa6c65a090b8f09a6b6502c32c2de0
 2017-04-02 00:22:44 -07:00
Bill Yi dbb769aed7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I1982e54320535710dbdc834c27ef2d1fa8943d2b
 2017-04-02 00:22:00 -07:00
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