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

40304 Commits (b395db96e9fedcd68ee50dbe548c71b4f2daa686)

Author SHA1 Message Date
Bill Yi 368535de6b Import translations. DO NOT MERGE 
Change-Id: Ib413b1988ad8828fdd42b34e9a2ad26c6237ce5a
Auto-generated-cl: translation import
 2017-05-22 17:58:33 -07:00
Adam Lesinski 267afc85d4 Merge "Revert "Revert "Use AAPT2""" into oc-dev am: e6cfc2ff63 
am: e777c7bdc7

Change-Id: Ibf41dc758b32f4b4f0398c5013ad6d3899743f49
 2017-05-19 00:20:30 +00:00
Adam Lesinski e777c7bdc7 Merge "Revert "Revert "Use AAPT2""" into oc-dev 
am: e6cfc2ff63

Change-Id: I7634a7cedd45ee01facad8cc91316ce7cf1544eb
 2017-05-19 00:12:43 +00:00
TreeHugger Robot e6cfc2ff63 Merge "Revert "Revert "Use AAPT2""" into oc-dev 2017-05-19 00:00:48 +00:00
Adam Lesinski 8c210e3948 Revert "Revert "Use AAPT2"" 
This reverts commit af1177453d.

Reason for revert: Bug in aapt2 was fixed b/38152130

Change-Id: I2701d67f581165d371a745749367c0c825168e22
 2017-05-17 22:54:28 +00:00
TreeHugger Robot c0d03f79bd Merge "Import translations. DO NOT MERGE" 2017-05-16 18:12:59 +00:00
TreeHugger Robot 709da7e3f4 Merge "Import translations. DO NOT MERGE" 2017-05-16 18:08:17 +00:00
Bill Yi 80bc1d494f Import translations. DO NOT MERGE 
Change-Id: I59054386d3666143821916c57c3ce9b6cbb3aaa1
Auto-generated-cl: translation import
 2017-05-16 09:10:00 -07:00
Bill Yi ee7e6e9c8d Import translations. DO NOT MERGE 
Change-Id: I433c4b65242ec711f0198a52e3041e8e2449f8cc
Auto-generated-cl: translation import
 2017-05-16 08:59:55 -07:00
Alan Viverette adafcbe7a9 Merge "Revert "Use AAPT2"" into oc-dev am: 3ac57504cd 
am: 811b5295df

Change-Id: Ifbf1782b7c55f7414b29215711c9cb08b69dd256
 2017-05-16 02:17:48 +00:00
Alan Viverette 811b5295df Merge "Revert "Use AAPT2"" into oc-dev 
am: 3ac57504cd

Change-Id: I45cb9a9ecfe5d273a2bfd56463c7a7ada868bf67
 2017-05-16 01:09:31 +00:00
TreeHugger Robot 3ac57504cd Merge "Revert "Use AAPT2"" into oc-dev 2017-05-16 01:05:09 +00:00
Alan Viverette af1177453d Revert "Use AAPT2" 
This reverts commit 0f6f5c0176.

Change-Id: Ibba7d35846cdbf6086877fd2859c2e2c91dcf2ee
 2017-05-15 23:06:07 +00:00
TreeHugger Robot c50b698341 Merge "Import translations. DO NOT MERGE" 2017-05-11 18:31:13 +00:00
Bill Yi 74ac863343 Import translations. DO NOT MERGE 
Change-Id: I5ff5d90c163bfb05bd4d8db583ed1deee5d844c4
Auto-generated-cl: translation import
 2017-05-11 07:38:49 -07:00
Bill Yi 441fbc5b91 Import translations. DO NOT MERGE 
Change-Id: Ifc3bd3ad01d6dc66711756664a51f1340cc8221b
Auto-generated-cl: translation import
 2017-05-11 07:16:51 -07:00
Paul Duffin fc91fc0582 Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" into oc-dev-plus-aosp 
am: 28f867d780  -s ours

Change-Id: Ifacc5fa99c5bf427504a6a8a8c71e57e251624b7
 2017-05-11 11:53:32 +00:00
Bill Yi 9f55244cb3 Merge "Import translations. DO NOT MERGE" into oc-dev am: add95c01b9 -s ours 
am: 4d3b0f119f  -s ours

Change-Id: Ib7dcfe1de90c6c25fd1bd59cf1261714152d64c6
 2017-05-11 11:53:07 +00:00
Bill Yi 0ad0c4be34 Merge "Import translations. DO NOT MERGE" into oc-dev am: d20b8bd58d -s ours 
am: fd3a13903f  -s ours

Change-Id: I66a10ca46048c3bdf0f134b66d81352a238d52c5
 2017-05-11 11:52:40 +00:00
Bill Yi 58cbd4a8a2 Import translations. DO NOT MERGE am: 99d1abb252 -s ours 
am: 7067b4a34f  -s ours

Change-Id: Ifd99a7bc781a8fa50be033aeef32e20711bb1440
 2017-05-11 11:52:14 +00:00
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
TreeHugger Robot fa081f77d7 Merge "Import translations. DO NOT MERGE" 2017-05-09 03:11:07 +00:00
Bill Yi b07a800d40 Import translations. DO NOT MERGE 
Change-Id: Ief94504ab531dd149c64aa56ac8ffe1433107e55
Auto-generated-cl: translation import
 2017-05-08 15:41:53 -07:00
Bill Yi b002922913 Import translations. DO NOT MERGE 
Change-Id: I221b061d69263c60affc309dc69ac3e06041e4a8
Auto-generated-cl: translation import
 2017-05-08 15:27:55 -07:00
Paul Duffin a94874651c Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 83f0d8dc18 am: 341a052cf9 am: 5151513a15 -s ours 
am: 439ca466de  -s ours

Change-Id: Iefca108075e53bcb59dcb71c3d2c21649d0d1964
 2017-05-08 20:37:08 +00: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
Paul Duffin 3bc673c040 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: I743f9e20e1e60836ceba9b9051fa17835deba3a2
 2017-05-05 15:30:11 +01:00
TreeHugger Robot 38720b6001 Merge "Import translations. DO NOT MERGE" 2017-05-05 12:07:40 +00:00
Bill Yi c04084dedd Import translations. DO NOT MERGE 
Change-Id: Ie0f5e63446535e0c8ab8652faafc100deeb4b43a
Auto-generated-cl: translation import
 2017-05-05 00:02:26 -07:00
Bill Yi 25302cdda8 Import translations. DO NOT MERGE 
Change-Id: I70ca2d22462fff5fade98a1cb96db5ec6d3a0f7b
Auto-generated-cl: translation import
 2017-05-04 23:53:22 -07:00
Alan Viverette 507a88f478 Merge "Use AAPT2" into oc-dev am: a9d9daebd2 
am: c53f1fbe95

Change-Id: I48d7964e30bb688f66e4295004c03738eef28d6e
 2017-05-02 16:02:31 +00: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
TreeHugger Robot 3c7155e156 Merge "Import translations. DO NOT MERGE" 2017-05-02 01:30:53 +00:00
The Android Open Source Project 207d2ba18a Import translations. DO NOT MERGE 
Change-Id: I18120d8f7deddfbf5f6558fc3c0afeddae95017e
Auto-generated-cl: translation import
 2017-05-01 09:09:42 -07:00
The Android Open Source Project 92dfcfe1ac Import translations. DO NOT MERGE 
Change-Id: I3434bfd7ac54492d1f422e43538381b9f1e65fdf
Auto-generated-cl: translation import
 2017-05-01 08:59:32 -07:00
Bill Yi 8b7a74eea0 Merge "Import translations. DO NOT MERGE" into oc-dev am: 2e0a752fd7 -s ours 
am: 9ec6cef05c  -s ours

Change-Id: Id35b1ef4a3ab1607a34298b71dd74eccd7e62f47
 2017-04-29 17:56:31 +00:00