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

41851 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bill Yi
1faa823150 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a9761dd09f -s ours 
am: ed4461afd4 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a1d8965ea9f181c7b014dead2472ca07548acbd
 2019-11-09 07:42:40 -08:00
Bill Yi
93b5d2cc73 [automerger skipped] Import translations. DO NOT MERGE am: 0d0e8bf980 -s ours 
am: 79be37cee6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibf7e51228ff15988ab94944efc3138deed1efd41
 2019-11-09 07:41:51 -08:00
Bill Yi
ed4461afd4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: a9761dd09f -s ours
am skip reason: subject contains skip directive

Change-Id: I9914a4fe4a5f7bfc909bf97f60d9c36f3fbed4f4
 2019-11-09 07:39:01 -08:00
Bill Yi
79be37cee6 [automerger skipped] Import translations. DO NOT MERGE 
am: 0d0e8bf980 -s ours
am skip reason: subject contains skip directive

Change-Id: Id1fe14eccc7ee8f1a4c7b70358d607d0108ab331
 2019-11-09 07:38:00 -08:00
TreeHugger Robot
a9761dd09f Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-11-09 15:31:27 +00:00
Bill Yi
0d0e8bf980 Import translations. DO NOT MERGE 
Change-Id: I5b95f6ad5e3e70baa6ac48af90d371436cbdc4db
Auto-generated-cl: translation import
 2019-11-09 01:15:41 -08:00
Bill Yi
c9332c48cd Import translations. DO NOT MERGE 
Change-Id: Ie07900be31c3c8d19e858a8abbb1193bc431da0f
Auto-generated-cl: translation import
 2019-11-09 01:12:46 -08:00
Bill Yi
845fcbc15a Merge "Import translations. DO NOT MERGE" 2019-11-01 19:34:00 +00:00
Xin Li
60d289d2ab [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 5de808a6d0 
am: 17e68a31e5 -s ours
am skip reason: subject contains skip directive

Change-Id: I2a85fd11ccab732858bae5e793e21f64ada26260
 2019-10-31 14:08:58 -07:00
Xin Li
17e68a31e5 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
am: 5de808a6d0

Change-Id: Icac694e26b1b14ff2c461bda7b5bea71527a6c96
 2019-10-31 13:22:04 -07:00
Bill Yi
20879d29dc Import translations. DO NOT MERGE 
Change-Id: I096635ffb38bb645e04c4ed143cece7ce68b6ddc
Auto-generated-cl: translation import
 2019-10-30 22:14:41 -07:00
Xin Li
5de808a6d0 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
Bug: 142003500
Change-Id: I7c7e27c71119341c8cafeb315788cf44b467c31b
 2019-10-30 11:50:06 -07:00
TreeHugger Robot
b1e4431c4a Merge "Import translations. DO NOT MERGE" 2019-10-27 20:49:14 +00:00
Bill Yi
8bb8bf356b Import translations. DO NOT MERGE 
Change-Id: Ia7e18aa418d665e934f39dfbebb4696a10fd129a
Auto-generated-cl: translation import
 2019-10-27 11:34:47 -07:00
Xin Li
59183a0efd [automerger skipped] Merge Coral/Flame into AOSP master am: edd21ffb49 -s ours am: 2b7ba7e4af -s ours am: 229f77abff -s ours 
am: 28dec7e440 -s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f is in history

Change-Id: Icfd2cdbb65cd7f9284053672a9ef2f2fc3584253
 2019-10-26 22:54:19 -07:00
Xin Li
28dec7e440 [automerger skipped] Merge Coral/Flame into AOSP master am: edd21ffb49 -s ours am: 2b7ba7e4af -s ours 
am: 229f77abff -s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f is in history

Change-Id: I98e315748dabd08af795d588ad4bc7fbea2bd8bd
 2019-10-26 22:46:13 -07:00
Xin Li
229f77abff [automerger skipped] Merge Coral/Flame into AOSP master am: edd21ffb49 -s ours 
am: 2b7ba7e4af -s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f is in history

Change-Id: I7fa7159bb18295b7de072d4769118df186e8b2e8
 2019-10-26 22:37:35 -07:00
Xin Li
2b7ba7e4af [automerger skipped] Merge Coral/Flame into AOSP master 
am: edd21ffb49 -s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f is in history

Change-Id: I50ae1a452471407dd779e039f192d4ec95c12a1c
 2019-10-26 22:21:11 -07:00
Xin Li
edd21ffb49 Merge Coral/Flame into AOSP master 
Bug: 141248619
Change-Id: I66aa50b606f3284d1a431f50cd6cae7574aab4a5
Merged-In: I4af5f825051fb85e4c6d58f310d9209036c63ea8
 2019-10-25 10:28:07 -07:00
Xin Li
c6ec399a6e Skip QD1A.190821.011 in stage-aosp-master am: c8782e216f am: 0de2363a6f 
am: 65537e4758

Change-Id: Ic0e2fb79c884711caa5f40f2ba29a7f2c2dcc6eb
 2019-10-23 16:01:24 -07:00
Xin Li
65537e4758 Skip QD1A.190821.011 in stage-aosp-master am: c8782e216f 
am: 0de2363a6f

Change-Id: Icbb4e2aaaa006902e5d0107803e39b7b83d18184
 2019-10-23 15:41:15 -07:00
Xin Li
0de2363a6f Skip QD1A.190821.011 in stage-aosp-master 
am: c8782e216f

Change-Id: I4b98af1ff11fbc56e4fe2c5511f4db341ad28b07
 2019-10-23 15:22:01 -07:00
Bill Yi
6c130fb1fa Import translations. DO NOT MERGE 
Change-Id: I82449a197920db5447cdf46cc3f7f4f2549d949d
Auto-generated-cl: translation import
 2019-10-19 03:47:32 -07:00
Xin Li
c8782e216f Skip QD1A.190821.011 in stage-aosp-master 
Bug: 141248619
Change-Id: I4af5f825051fb85e4c6d58f310d9209036c63ea8
 2019-10-16 15:19:27 -07:00
Bill Yi
a3b0683a17 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours am: 48fd3d016a -s ours am: a68bdf59af -s ours 
am: bc508606fc -s ours
am skip reason: subject contains skip directive

Change-Id: Ib702b9e34fde23353055aa9915b9fca8249d6280
 2019-10-12 13:26:19 -07:00
Bill Yi
be2e38658a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours am: 48fd3d016a -s ours am: 4a9f2bce9a -s ours 
am: dc754ce791 -s ours
am skip reason: subject contains skip directive

Change-Id: I4594a11594ee703a25dbb918f759c8af3bdac8fd
 2019-10-12 13:26:00 -07:00
Bill Yi
62dcf1d391 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours am: 62880febef -s ours am: 2a33dbf0fa -s ours 
am: 06a6bf5ecc -s ours
am skip reason: subject contains skip directive

Change-Id: Id975ffda749e3e9483447cd7b81ce97cc75c82ed
 2019-10-12 13:25:40 -07:00
Bill Yi
1031bd58fa [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours am: 62880febef -s ours am: 101d12062e -s ours 
am: ccf58a9aaf -s ours
am skip reason: subject contains skip directive

Change-Id: I0a25dedd8476d0ce436c4d8cb7fa28986310fbb1
 2019-10-12 13:25:20 -07:00
Android Build Merger (Role)
bc508606fc Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours am: 48fd3d016a -s ours am: a68bdf59af -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 20:20:02 +00:00
Bill Yi
dc754ce791 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours am: 48fd3d016a -s ours 
am: 4a9f2bce9a -s ours
am skip reason: subject contains skip directive

Change-Id: I90f21d2c572ef03980a622ee9c92decc47269d7a
 2019-10-12 13:19:50 -07:00
Bill Yi
746d832a1e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours am: 48fd3d016a -s ours 
am: a68bdf59af -s ours
am skip reason: subject contains skip directive

Change-Id: I6ab9b421954696e364952f43246e6e2c9fc51d60
 2019-10-12 13:19:50 -07:00
Bill Yi
c8392c5ca9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours am: 7c609c0cc4 -s ours am: fb2d095a03 -s ours 
am: cda0449dd9 -s ours
am skip reason: subject contains skip directive

Change-Id: I9019decbb482d22395707509604bec9bbb19e978
 2019-10-12 13:14:10 -07:00
Bill Yi
4a9f2bce9a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours 
am: 48fd3d016a -s ours
am skip reason: subject contains skip directive

Change-Id: I61f5482e934631476aedef0e3dece656489da873
 2019-10-12 13:13:49 -07:00
Bill Yi
a68bdf59af [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours 
am: 48fd3d016a -s ours
am skip reason: subject contains skip directive

Change-Id: I787484f47dcbf7227ffce7a7d7d3f39acbd01001
 2019-10-12 13:13:49 -07:00
Bill Yi
5af94ecc9b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours am: 7c609c0cc4 -s ours am: 08d02150b8 -s ours 
am: 134778e573 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic03511d581718fb786c55ca4d31affa7392bcc84
 2019-10-12 13:13:49 -07:00
Android Build Merger (Role)
06a6bf5ecc Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours am: 62880febef -s ours am: 2a33dbf0fa -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 20:08:27 +00:00
Bill Yi
2713c24d7c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours am: 62880febef -s ours 
am: 2a33dbf0fa -s ours
am skip reason: subject contains skip directive

Change-Id: I9d8b692cf5613a3d566527275c326c114818f553
 2019-10-12 13:08:17 -07:00
Bill Yi
ccf58a9aaf [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours am: 62880febef -s ours 
am: 101d12062e -s ours
am skip reason: subject contains skip directive

Change-Id: If17949a38494bdaae0b599a41c2ae9beeb848a4f
 2019-10-12 13:08:11 -07:00
Android Build Merger (Role)
cda0449dd9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours am: 7c609c0cc4 -s ours am: fb2d095a03 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 20:08:04 +00:00
Bill Yi
48fd3d016a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 7604e64ecc -s ours
am skip reason: subject contains skip directive

Change-Id: Iaf05b347b2b5d48857c449a4eecba8d917aa54da
 2019-10-12 13:07:48 -07:00
Bill Yi
134778e573 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours am: 7c609c0cc4 -s ours 
am: 08d02150b8 -s ours
am skip reason: subject contains skip directive

Change-Id: I1edca3959658ca296a4acc1261f0b1447b70fc7e
 2019-10-12 13:07:48 -07:00
Bill Yi
87a09a190c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours am: 7c609c0cc4 -s ours 
am: fb2d095a03 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifbf7a39926061a9f87cc65a70ced6f5f553dd2bd
 2019-10-12 13:07:48 -07:00
Bill Yi
2a33dbf0fa [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours 
am: 62880febef -s ours
am skip reason: subject contains skip directive

Change-Id: I022a0f63e2f73f42acba9ef1976eda5223bb0972
 2019-10-12 12:54:52 -07:00
Bill Yi
101d12062e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2 -s ours 
am: 62880febef -s ours
am skip reason: subject contains skip directive

Change-Id: I854f9600e4806cb82cd4a324836e88e05e258cf9
 2019-10-12 12:54:52 -07:00
Bill Yi
08d02150b8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours 
am: 7c609c0cc4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie402c6a14b1c86ad2ba41d0af728aa4fb31c55cf
 2019-10-12 12:54:33 -07:00
Bill Yi
fb2d095a03 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3 -s ours 
am: 7c609c0cc4 -s ours
am skip reason: subject contains skip directive

Change-Id: I836b594b3870dfdac403f7b7194e0af5045f2d30
 2019-10-12 12:54:33 -07:00
TreeHugger Robot
7604e64ecc Merge "Import translations. DO NOT MERGE" into qt-dev 2019-10-12 19:54:25 +00:00
Bill Yi
1f0792dfc2 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours am: fde82958ce -s ours 
am: 0b32d74e30 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib66b021546a71cc2abec26f8674b6b2935512bc9
 2019-10-12 12:49:04 -07:00
Bill Yi
b3169ab23b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours am: 8095dc0335 -s ours 
am: f5eab04303 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic1dcf850cbb3ef8b2f5e0323acb41911f49ff83b
 2019-10-12 12:48:43 -07:00
Bill Yi
5ede8c526a Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours am: 545560b547 -s ours am: bea0b23926 -s ours 
am: 9a4bc0c15f -s ours
am skip reason: subject contains skip directive

Change-Id: I0a92bb590453f8e1fced99a69701c0e2cca1bde1
 2019-10-12 12:48:25 -07:00