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

41645 Commits (17e68a31e505ce4d4c91244f9463a82efbdbf76b)

Author SHA1 Message Date
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
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
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 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
Xin Li c8782e216f Skip QD1A.190821.011 in stage-aosp-master 
Bug: 141248619
Change-Id: I4af5f825051fb85e4c6d58f310d9209036c63ea8
 2019-10-16 15:19:27 -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 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 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
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 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 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 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 62880febef [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 6b7a42ebf2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82d7a41da78f4ee69f786cfa7a7681ea21438af1
 2019-10-12 12:48:01 -07:00
Android Build Merger (Role) 0b32d74e30 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 skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 19:42:13 +00:00
Bill Yi 01e4ed3f3b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours 
am: fde82958ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I434fbb316d2a10f3b68045de8500fed5625b53db
 2019-10-12 12:42:02 -07:00
Android Build Merger (Role) 9a4bc0c15f 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 skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 19:41:54 +00:00
Bill Yi a9d47e02c1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours am: 545560b547 -s ours 
am: 5f9a1f096a -s ours
am skip reason: subject contains skip directive

Change-Id: I5c32b1d921da8a9616cc728e41a2f45dac07aaec
 2019-10-12 12:41:43 -07:00
Bill Yi 46deb644e0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours am: 545560b547 -s ours 
am: bea0b23926 -s ours
am skip reason: subject contains skip directive

Change-Id: I477764102ed76b9d802ba410a68245e823acc188
 2019-10-12 12:41:43 -07:00
TreeHugger Robot 6b7a42ebf2 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-10-12 19:39:54 +00:00
TreeHugger Robot abff0ad0e3 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-10-12 19:37:34 +00:00
Bill Yi fde82958ce [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours 
am: c70c3a3236 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9e6eda811ead3e547ba9c299dd790a3d5fb5aba
 2019-10-12 12:35:35 -07:00
Android Build Merger (Role) a8b8b8a541 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours am: 0bc3df3750 -s ours am: dc9a31d129 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 19:35:28 +00:00
Bill Yi 5f9a1f096a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours 
am: 545560b547 -s ours
am skip reason: subject contains skip directive

Change-Id: I88dc3ae882b713ce134f45044dd51e54dbb78ac2
 2019-10-12 12:35:17 -07:00
Bill Yi bfdaa8cea8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours am: 0bc3df3750 -s ours 
am: f3e110b97e -s ours
am skip reason: subject contains skip directive

Change-Id: I3d96c191bea2f0691bf01cf85c54286ef30e560b
 2019-10-12 12:35:17 -07:00
Bill Yi bea0b23926 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928 -s ours 
am: 545560b547 -s ours
am skip reason: subject contains skip directive

Change-Id: Idc3719dff7c48d853ca8e1918d69bebbb7ebe2c5
 2019-10-12 12:35:16 -07:00
Bill Yi 70464fca0e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours am: 0bc3df3750 -s ours 
am: dc9a31d129 -s ours
am skip reason: subject contains skip directive

Change-Id: I59e1de1eaa7965ddaaf4a04828d0e64a2865125b
 2019-10-12 12:35:16 -07:00
Bill Yi c70c3a3236 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: e9fa91113e -s ours
am skip reason: subject contains skip directive

Change-Id: I230864ffc1832bf287f2771f84dcee9bfbcebd41
 2019-10-12 12:29:33 -07:00
Android Build Merger (Role) f56d0c11c2 Merge "[automerger skipped] Import translations. DO NOT MERGE am: bbac87b20e -s ours am: ef5cf8a8d7 -s ours am: 9af9c775f0 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-12 19:29:28 +00:00
Bill Yi dc9a31d129 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours 
am: 0bc3df3750 -s ours
am skip reason: subject contains skip directive

Change-Id: Id46cc6f88bb32c69d80dfc8fc04d78c7887c0f52
 2019-10-12 12:29:15 -07:00
Bill Yi 545560b547 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 9223659928 -s ours
am skip reason: subject contains skip directive

Change-Id: I7ad6ef899c277169ac2b338763c21e16043cf943
 2019-10-12 12:29:15 -07:00
Bill Yi f3e110b97e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours 
am: 0bc3df3750 -s ours
am skip reason: subject contains skip directive

Change-Id: If3b99e08ff4355c1cf077f42323549dce256b833
 2019-10-12 12:29:15 -07:00
Bill Yi 5d70af8621 [automerger skipped] Import translations. DO NOT MERGE am: bbac87b20e -s ours am: ef5cf8a8d7 -s ours 
am: 741bc5f0a5 -s ours
am skip reason: subject contains skip directive

Change-Id: I628a9792e1b4388d86ef6b148be5be6ed338d03c
 2019-10-12 12:29:15 -07:00
Bill Yi 03738ff9bc [automerger skipped] Import translations. DO NOT MERGE am: bbac87b20e -s ours am: ef5cf8a8d7 -s ours 
am: 9af9c775f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I12d41b6fa2190370b4b70e91c73df7e3541e8147
 2019-10-12 12:29:15 -07:00