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

40760 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bill Yi
9bb4e94d0a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e43661faae -s ours 
am: d77d71b7a5  -s ours

Change-Id: I1c1d7f81006788cd8629c6c6c6ba7be60a6d1513
 2017-12-21 17:49:13 +00:00
Bill Yi
3ae1830916 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86496c0a8e -s ours 
am: 3ab5fd5619  -s ours

Change-Id: Ib0ec6a24cf8e25d71af255f3c06deee2749a3f6b
 2017-12-21 17:48:57 +00:00
Bill Yi
dcea1090b0 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1d4e1aadbc -s ours 
am: e052b904d3  -s ours

Change-Id: Idf106e8eb40abe1d5c4f9c299c204f5b31d8e04b
 2017-12-21 17:48:42 +00:00
Bill Yi
935ce8d1b8 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d626e07492 -s ours 
am: dd70db430a  -s ours

Change-Id: I0fa7cacb1558577d831d7d34bfc17bd00db348b0
 2017-12-21 17:48:27 +00:00
Bill Yi
bfe9042d64 Import translations. DO NOT MERGE am: 7f39ff785e -s ours 
am: 7659c56784  -s ours

Change-Id: I6c3ce912214abdd2cdb37bad8429113e63e5ef10
 2017-12-21 17:48:12 +00:00
Bill Yi
ab6d16cf88 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 
am: ce7d21ad2e  -s ours

Change-Id: Ifeebbb62fc19818763a60e3a74301f48a04d5816
 2017-12-21 17:47:57 +00:00
Bill Yi
71dabe0eed Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 
am: da3b9b9752  -s ours

Change-Id: I4fc8311aaf02b2555def8b7550bd17a5b4e18cd9
 2017-12-21 17:47:41 +00:00
Bill Yi
b5ea28b58a Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 
am: 0149f480f6  -s ours

Change-Id: I4171b39c31b76b84300d9802706102170003ed0f
 2017-12-21 17:47:24 +00:00
Bill Yi
0eb4382f34 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 
am: 82f6b2d105  -s ours

Change-Id: I63ce80697d5d44f5ea67a43d4438ede095fd9971
 2017-12-21 17:47:08 +00:00
Bill Yi
6b7423b2a0 Import translations. DO NOT MERGE 
am: 5b4b6457d9  -s ours

Change-Id: I05eafbac66243bae4a2f9af4616777df2891dd95
 2017-12-21 17:46:47 +00:00
Bill Yi
d77d71b7a5 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 
am: e43661faae  -s ours

Change-Id: Ia76c9bf7502f13860eeb8906933544b365073749
 2017-12-20 20:38:42 +00:00
Bill Yi
3ab5fd5619 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 
am: 86496c0a8e  -s ours

Change-Id: I253736c317d8d119b34db89cca6df7d62f84afc8
 2017-12-20 20:38:25 +00:00
Bill Yi
e052b904d3 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 
am: 1d4e1aadbc  -s ours

Change-Id: I6e203b49328a8ad3dccde04b12494a7fd7f2620d
 2017-12-20 20:38:09 +00:00
Bill Yi
dd70db430a Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 
am: d626e07492  -s ours

Change-Id: I44e62e4825b52be0ec277f1b77421cd4997bb2f9
 2017-12-20 20:37:53 +00:00
Bill Yi
7659c56784 Import translations. DO NOT MERGE 
am: 7f39ff785e  -s ours

Change-Id: I91b2fc3c61e368f28e48dd3108fedd399d1e7d49
 2017-12-20 20:37:32 +00:00
TreeHugger Robot
ce7d21ad2e Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-20 20:21:01 +00:00
TreeHugger Robot
da3b9b9752 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-20 20:15:24 +00:00
TreeHugger Robot
0149f480f6 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-20 20:14:56 +00:00
TreeHugger Robot
82f6b2d105 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-20 20:13:41 +00:00
TreeHugger Robot
e43661faae Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-12-20 20:06:48 +00:00
TreeHugger Robot
86496c0a8e Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-12-20 19:57:45 +00:00
TreeHugger Robot
1d4e1aadbc Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-12-20 19:55:13 +00:00
TreeHugger Robot
d626e07492 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-12-20 19:54:29 +00:00
TreeHugger Robot
beae30c4e8 Merge "Import translations. DO NOT MERGE" 2017-12-20 19:33:57 +00:00
TreeHugger Robot
fd2574bda4 Merge "Import translations. DO NOT MERGE" 2017-12-20 19:22:45 +00:00
Bill Yi
b48a279124 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3d75a28014c36d61c21c48c33eccddc2a753a78d
 2017-12-19 18:22:13 -08:00
Bill Yi
5b4b6457d9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I69f3689d113dbb5fdc5bf4b5fe538d24c2aeeb0a
 2017-12-19 18:11:43 -08:00
Bill Yi
f435ce79ae Import translations. DO NOT MERGE 
Change-Id: I265c7babd1e0f3d6ed7dc9ddf7779f770520cca5
Auto-generated-cl: translation import
 2017-12-19 18:01:17 -08:00
Bill Yi
7f39ff785e Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If8517d5669dde19ce47805286ebdf9a330960892
 2017-12-19 17:48:13 -08:00
Bill Yi
bbf61fc5d6 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I62e324677b8c212ff4b94ccfa46102a8971ad39e
 2017-12-19 17:47:37 -08:00
Bill Yi
f9d361dcd8 Import translations. DO NOT MERGE 
Change-Id: I47cd7bc7be3a009b204ecd509b98577d5a07ee38
Auto-generated-cl: translation import
 2017-12-19 17:47:00 -08:00
Bill Yi
2bf06e5c50 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9cd6184f5b9a65b84a46d2bb271b536237fa8f44
 2017-12-19 17:43:45 -08:00
Bill Yi
96357bd31e Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I23df49c7d77697a168da5c2d1201078582349eab
 2017-12-19 17:43:06 -08:00
Bill Yi
880763fb04 Import translations. DO NOT MERGE 
Change-Id: Id98113aaa443c1107240b4002a35a8d9e1ea129b
Auto-generated-cl: translation import
 2017-12-19 17:42:24 -08:00
Bill Yi
c44d798e7e Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I109194df374b25260a047bf0e5b3993edfa9275a
 2017-12-19 17:40:34 -08:00
Bill Yi
8139573ff0 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I4c5f3c11ba98c1ee0dc4ad110ddf8f92eb13ac75
 2017-12-19 17:39:26 -08:00
Bill Yi
4798b39caa Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I79026cc9df0e25bc2417dd20eed3031a46a238e8
 2017-12-19 17:34:39 -08:00
Bill Yi
87d2226e3b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I118125d24857d4aae99800775c0456ee94c56676
 2017-12-19 17:33:50 -08:00
Paul Duffin
8a45a970ab Add android.test.base/stubs dependency 
In preparation for the removal of the non-junit classes in the
android.test.base library from the android.jar this adds a dependency
on android.test.base/stubs to ensure this code will continue to
compile.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    LatinIMETests's will need them in order to compile once its classes
    are removed from the current SDK on which it currently depends.

Bug: 30188076
Test: make dist
Change-Id: I9f2244d4b5711620dc02dd24dc407807d726480e
 2017-12-15 07:22:38 +00:00
Colin Cross
fc55b74b57 Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" am: 87c6fcf126 am: 88f12fdcce 
am: d373b6c4a5  -s ours

Change-Id: I86e0ae275098b662783ca97b9a73bbcd80cac611
 2017-12-13 01:58:08 +00:00
Colin Cross
d373b6c4a5 Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" am: 87c6fcf126 
am: 88f12fdcce

Change-Id: I4ffe046c3b332cd065ba5735f23e19b8d067ac6b
 2017-12-13 01:44:36 +00:00
Colin Cross
88f12fdcce Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" 
am: 87c6fcf126

Change-Id: Iaf8222d9bde062ebd6a75a610961b518a2fd65ca
 2017-12-13 01:12:43 +00:00
Colin Cross
87c6fcf126 Merge "Use a.t.mock.stubs instead of a.t.mock.sdk" 2017-12-12 23:26:41 +00:00
TreeHugger Robot
48011de49f Merge "Import translations. DO NOT MERGE" 2017-12-08 20:00:11 +00:00
TreeHugger Robot
a97cfc272a Merge "Import translations. DO NOT MERGE" 2017-12-08 05:29:23 +00:00
Xin Li
913ab6557d Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d8a341b914 -s ours am: 6819b9691a 
am: 55cf499d38  -s ours

Change-Id: I01d1445d4d5bedb92c343a464d0af9c21b1df3cd
 2017-12-08 04:40:23 +00:00
Bill Yi
3d21834741 Import translations. DO NOT MERGE 
Change-Id: I1fb69251a612e2f064b418a651e5c679aeb6f528
Auto-generated-cl: translation import
 2017-12-07 17:02:42 -08:00
Bill Yi
4d9d9b3224 Import translations. DO NOT MERGE 
Change-Id: I23bdefa3861b985df5f0cec0cfc84e85df449e58
Auto-generated-cl: translation import
 2017-12-07 17:02:31 -08:00
Stephen Li
aa43373fb8 Manually merge changes from giant AOSP topic 
Change-Id: Ib64f9a5480b83acb2ef855d5c45a7defcdd5be8a
 2017-12-07 23:29:32 +00:00
Paul Duffin
85c065986f Use a.t.mock.stubs instead of a.t.mock.sdk 
Remove dependencies on android.test.mock.sdk as it is a duplicate of
android.test.mock.stubs and will be removed.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Replaced 'android.test.mock.sdk' with 'android.test.mock.stubs' in
    LOCAL_JAVA_LIBRARIES because android.test.mock.sdk has been
    deprecated.

Bug: 30188076
Test: make checkbuild
Change-Id: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1
Merged-In: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1
(cherry picked from commit 097130d198)
 2017-12-07 13:34:41 -08:00