nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
40040 commits 1 branch 0 tags 363 MiB
Commit graph

40040 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Duffin
28f867d780 Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp 2017-05-11 11:31:19 +00:00
Bill Yi
4d3b0f119f Merge "Import translations. DO NOT MERGE" into oc-dev 
am: add95c01b9  -s ours

Change-Id: If0a6f3ad7aede027d34bdce9ca6cceb7457ea210
 2017-05-11 05:45:00 +00:00
Bill Yi
fd3a13903f Merge "Import translations. DO NOT MERGE" into oc-dev 
am: d20b8bd58d  -s ours

Change-Id: Id10c6493693229151d15ddd872188ace68e73429
 2017-05-11 05:44:39 +00:00
Bill Yi
7067b4a34f Import translations. DO NOT MERGE 
am: 99d1abb252  -s ours

Change-Id: I9c07e145ba5f24496df9cee2849e171496ab4697
 2017-05-11 05:44:07 +00:00
TreeHugger Robot
add95c01b9 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-11 02:52:37 +00:00
TreeHugger Robot
d20b8bd58d Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-11 02:05:00 +00:00
Bill Yi
99d1abb252 Import translations. DO NOT MERGE 
Change-Id: Icaa3e3e60a2e632a02a317b0dad32c9c6e3c1072
Auto-generated-cl: translation import
 2017-05-10 12:06:09 -07:00
Bill Yi
1045ec5158 Import translations. DO NOT MERGE 
Change-Id: Id738f4b110ee27a2c18cf8ade15afe67e5b150f8
Auto-generated-cl: translation import
 2017-05-10 11:57:01 -07:00
Bill Yi
c55c0b86f7 Import translations. DO NOT MERGE 
Change-Id: I79556fca866d6054a2327222d73809e93ba80185
Auto-generated-cl: translation import
 2017-05-10 11:55:04 -07:00
Paul Duffin
381c38a127 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: Icf844999082db141cffcb099aa4004afc7a7c749
Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2
 2017-05-10 09:45:07 +01:00
Paul Duffin
439ca466de Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 83f0d8dc18 am: 341a052cf9 
am: 5151513a15  -s ours

Change-Id: I1551963c45f5d4b94d1fe42d3405350eda4ca389
 2017-05-08 20:33:35 +00:00
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
Alan Viverette
c53f1fbe95 Merge "Use AAPT2" into oc-dev 
am: a9d9daebd2

Change-Id: I1c3cf78d426e298d81d1d255c315d4ed95b15afb
 2017-05-02 13:39:22 +00:00
TreeHugger Robot
a9d9daebd2 Merge "Use AAPT2" into oc-dev 2017-05-02 13:37:23 +00:00
Bill Yi
9ec6cef05c Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 2e0a752fd7  -s ours

Change-Id: Id259fc90bee8486de44461f74c250b066abe7e4d
 2017-04-29 17:55:04 +00:00
Bill Yi
ba04db407e Merge "Import translations. DO NOT MERGE" into oc-dev 
am: d0a66300ff  -s ours

Change-Id: I5bdfc474cabd8734d6de0845ff989d314b4fcfcd
 2017-04-29 17:54:51 +00:00
TreeHugger Robot
2e0a752fd7 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-29 17:53:41 +00:00
Bill Yi
759445f009 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: f262018755  -s ours

Change-Id: I91ee52ad8985fb4986649cee89e6d5bef96f76ac
 2017-04-29 17:51:57 +00:00
Bill Yi
c0f5daee33 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: b9996623fe  -s ours

Change-Id: I0db32e9c8a308037ed7e93ea996f12a38c400be7
 2017-04-29 17:51:46 +00:00
TreeHugger Robot
d0a66300ff Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-29 17:51:33 +00:00
Bill Yi
79036f3994 Import translations. DO NOT MERGE 
am: bd1947dc01  -s ours

Change-Id: Ic694a675584beee381663e01f0aacd48d868c2f2
 2017-04-29 17:51:33 +00:00
TreeHugger Robot
f262018755 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-29 17:50:31 +00:00
TreeHugger Robot
b9996623fe Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-29 17:45:02 +00:00
Bill Yi
0f8cdf4392 Import translations. DO NOT MERGE 
Change-Id: Ide2d46f805a5bb36b32d6ebaec8d987973b816ab
Auto-generated-cl: translation import
 2017-04-28 22:56:16 -07:00
Bill Yi
bd1947dc01 Import translations. DO NOT MERGE 
Change-Id: I98560e277103ff606353cff46889ecdb4d7a3b86
Auto-generated-cl: translation import
 2017-04-28 22:47:46 -07:00
Bill Yi
cbb6f37771 Import translations. DO NOT MERGE 
Change-Id: I19cf3418e3bb56a10729741b0d7514533a92f6be
Auto-generated-cl: translation import
 2017-04-28 22:44:15 -07:00
Bill Yi
8f9249c48b Import translations. DO NOT MERGE 
Change-Id: I13becab3eb65dbb5466387d2781af7226f8dee0e
Auto-generated-cl: translation import
 2017-04-28 22:42:11 -07:00
Bill Yi
ac0f5e0a10 Import translations. DO NOT MERGE 
Change-Id: Ib3dc9dfc6748012de4882a5421993b7bbe825deb
Auto-generated-cl: translation import
 2017-04-28 22:41:29 -07:00
Alan Viverette
0f6f5c0176 Use AAPT2 
Test: make checkbuild
Change-Id: I8478dd61a2edf8f87437276025ed57092c1b047c
 2017-04-26 16:13:45 -04:00
Bill Yi
270c407f95 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 0a472ed0df  -s ours

Change-Id: I5384c6783fb5138da74d8c9229738d66663680fc
 2017-04-11 18:16:48 +00:00
Bill Yi
c0c8f3b8ea Import translations. DO NOT MERGE 
am: 8e3bb06f6b  -s ours

Change-Id: I497a842d973e5143d247145589d35105cec2a356
 2017-04-11 18:16:35 +00:00
TreeHugger Robot
0a472ed0df Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-11 17:58:04 +00:00
Bill Yi
8e3bb06f6b Import translations. DO NOT MERGE 
Change-Id: Ia6a62ea85b0a61cf94e4dbe20bddcb5aa0e99eba
Auto-generated-cl: translation import
 2017-04-10 20:24:49 -07:00
Bill Yi
74702b9ab0 Import translations. DO NOT MERGE 
Change-Id: I57c2a9e284ad880ee56a8d40bf88a02a74554069
Auto-generated-cl: translation import
 2017-04-10 20:23:19 -07:00
Bill Yi
574742b492 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f58518ea9c -s ours 
am: 84e782d4d1  -s ours

Change-Id: I897c8e18fc27236fbc41837c75bc85d8e58e0fe3
 2017-04-03 02:28:11 +00: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
159713016c Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 76116a45b7 -s ours 
am: 593bf07724  -s ours

Change-Id: Ic19affac57005e7f2f066f3d5899e4fe5bedf05b
 2017-04-02 08:34:56 +00:00
Bill Yi
70dfb95cf5 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7cf67d843c -s ours 
am: cb19e71124  -s ours

Change-Id: I00aa5ae2a9348676fde34aff13aae685be1bff29
 2017-04-02 08:34:45 +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
Bill Yi
45adfd8ac1 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: fdd8c4bbee -s ours 
am: 3b5113a48d  -s ours

Change-Id: I35e875428f30d65354af60228d90a8d4ad5af790
 2017-04-02 08:25:36 +00:00
Bill Yi
69802b7573 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: dfd4523ad3 -s ours 
am: d72478519e  -s ours

Change-Id: Id189041164770a92dd3c215cf3eed30a16eb9f3d
 2017-04-02 08:25:25 +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
bb390ff2e3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3d0304f5b6 -s ours 
am: 4e1a184db2  -s ours

Change-Id: I7b493d62f45f0b36b036a200ea76c307c477dddc
 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