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

41460 Commits (7a2ab6210212fd4b9af7944e577a86407cb04001)

Author SHA1 Message Date
Xin Li 7a2ab62102 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 309cb0811a -s ours 
am: dc59e8ef85 -s ours
am skip reason: change_id I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16 with SHA1 66fb808791 is in history

Change-Id: I83da0052be33376ba93b76579b8572576f052e55
 2019-09-08 15:28:34 -07:00
Xin Li dc59e8ef85 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
am: 309cb0811a -s ours
am skip reason: change_id I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16 with SHA1 66fb808791 is in history

Change-Id: I6bf3b33ff71e45d1417b068e1220ca3a78767c63
 2019-09-08 14:45:40 -07:00
Xin Li 309cb0811a Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
No content change.

Bug: 135460123
Change-Id: Id5c0fc0c6138cd09b46e5029dfeff1fc3f54753a
Merged-In: I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16
 2019-09-08 12:45:26 -07:00
Xin Li d29ac85675 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ccb19fdda7 -s ours am: 78650efb26 
am: e1b597cee6

Change-Id: If18b15bcec3dd48bd5ed166ec93498710c0f6954
 2019-09-05 14:31:52 -07:00
Xin Li e1b597cee6 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ccb19fdda7 -s ours 
am: 78650efb26

Change-Id: Ib06b5ddd7c7c93a6befda77a946c8e878fa4ce1f
 2019-09-05 14:07:44 -07:00
Xin Li 78650efb26 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" 
am: ccb19fdda7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia97dc4e010f0470b8eb37c1556e35774a67945c2
 2019-09-05 13:35:32 -07:00
Xin Li ccb19fdda7 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:24 +00:00
Xin Li 66fb808791 DO NOT MERGE - Merge Android 10 into master 
Bug: 139893257
Change-Id: I67cbe34b4646ddfdb0868bf8eaca12100a4e7b16
 2019-09-04 13:34:53 -07:00
Bill Yi 7735923c52 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: 7b9006e18c -s ours
am skip reason: subject contains skip directive

Change-Id: I443f911c5060cde96ff18fbfcd591360e048a290
 2019-09-03 12:56:43 -07:00
Bill Yi b94964512a [automerger skipped] Import translations. DO NOT MERGE 
am: e0d1d88541 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia80fec9dd11b52fbd91432b00c1110e16f9005b0
 2019-09-03 12:53:38 -07:00
TreeHugger Robot 7b9006e18c Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-09-03 19:22:38 +00:00
Bill Yi 19b7dc6cbb Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I71e377a96cbf732af7d10ef6db7e964774114179
 2019-09-03 08:19:20 -07:00
Bill Yi e0d1d88541 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I175a8daf0a75e10e0c00c41103c2a30722714fb9
 2019-09-03 08:17:03 -07:00
Bill Yi 527eeca672 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 4492996f04 -s ours 
am: 3071857e03 -s ours
am skip reason: subject contains skip directive

Change-Id: Iff64d278eb7d1d18e0ef22f8ad65f22f3cf0d323
 2019-08-19 14:04:51 -07:00
Bill Yi 7c1b66885c [automerger skipped] Import translations. DO NOT MERGE am: 72b1a8b722 -s ours 
am: 295bba0c03 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibfa4422f4cf0a785b2e54c638d43ed5000551db2
 2019-08-19 13:55:48 -07:00
Bill Yi 021da087d7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 4492996f04 -s ours 
am: c3211cb040 -s ours
am skip reason: subject contains skip directive

Change-Id: Ided46a144d93daec61b04c5759889b27df26ab13
 2019-08-19 13:33:52 -07:00
Bill Yi 9d13cc5de0 [automerger skipped] Import translations. DO NOT MERGE am: 72b1a8b722 -s ours 
am: 66b32daac4 -s ours
am skip reason: subject contains skip directive

Change-Id: I94a2b591226caeb89e24a7c138c49b4b58aff45b
 2019-08-19 13:32:13 -07:00
Bill Yi c3211cb040 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 4492996f04 -s ours
am skip reason: subject contains skip directive

Change-Id: I427927441d7978317f0311239ec3357597603a11
 2019-08-19 13:26:19 -07:00
Bill Yi 66b32daac4 [automerger skipped] Import translations. DO NOT MERGE 
am: 72b1a8b722 -s ours
am skip reason: subject contains skip directive

Change-Id: I3146a2b640d9fd6e5c12886d0a8bf7c725200d72
 2019-08-19 13:23:47 -07:00
Bill Yi 3071857e03 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 4492996f04 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaca8ad3c75f35a0dbdb71855fb3abfdaf6fa953e
 2019-08-19 13:22:11 -07:00
Bill Yi 295bba0c03 [automerger skipped] Import translations. DO NOT MERGE 
am: 72b1a8b722 -s ours
am skip reason: subject contains skip directive

Change-Id: I28fd616ce61c6173b552792fa8a0c538903bccb8
 2019-08-19 13:20:39 -07:00
TreeHugger Robot 4492996f04 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-08-19 19:17:46 +00:00
Bill Yi 72b1a8b722 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I576eae018336f225d9e6c9dce6eaba6742ce9581
 2019-08-18 07:20:54 -07:00
Bill Yi 1cca7afad6 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie12258d268be80afd21cf01c8fb2c32d5d522ecb
 2019-08-18 07:18:27 -07:00
Xin Li 197cf7dad0 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 7748102af1 -s ours am: b88a8516f3 
am: e548aec3fe

Change-Id: I90fb7c7ed25ef5e46793d7654cdbb09edd4b1e13
 2019-08-14 14:41:59 -07:00
Xin Li e548aec3fe [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 7748102af1 -s ours 
am: b88a8516f3

Change-Id: I08f2b2c10621f4322ce59bea7c30a336707de79d
 2019-08-14 14:07:59 -07:00
Xin Li b88a8516f3 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master 
am: 7748102af1 -s ours
am skip reason: subject contains skip directive

Change-Id: I1229451d40fb142f3f46e591e1dadc652b232685
 2019-08-14 13:39:14 -07:00
Xin Li 7748102af1 DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master 
Bug: 134405016
Change-Id: I85024313e36aa6450602dd17cd9bcd7220780ecd
 2019-08-14 11:35:21 -07:00
Bill Yi 1e4d00401d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: cd95311674 -s ours 
am: 1080d669ab -s ours
am skip reason: subject contains skip directive

Change-Id: Ibec5e92190b0151678c401d7ee8dc9417c63194b
 2019-07-24 17:39:35 -07:00
Bill Yi ab260ffa84 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: cd95311674 -s ours 
am: c83cc88f9b -s ours
am skip reason: subject contains skip directive

Change-Id: I179b15a6ffc24831696d28e86ffba7d145c8f0e8
 2019-07-24 17:38:53 -07:00
Bill Yi 1080d669ab [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: cd95311674 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieef0e13f6154015f45f2f5dfa1204eaf40f116a1
 2019-07-24 17:26:10 -07:00
Bill Yi c83cc88f9b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: cd95311674 -s ours
am skip reason: subject contains skip directive

Change-Id: I78c9b535c5596c089be47a8a06e2e7b309d244f6
 2019-07-24 17:26:07 -07:00
Bill Yi 80fa2bdcf9 [automerger skipped] Import translations. DO NOT MERGE am: ce1f65074a -s ours 
am: 33dec1203c -s ours
am skip reason: subject contains skip directive

Change-Id: Ie122c64d041547d05d605b0422b54a44ff5cf943
 2019-07-24 17:19:20 -07:00
Bill Yi f65b7bbaf9 [automerger skipped] Import translations. DO NOT MERGE am: ce1f65074a -s ours 
am: 2792b8483c -s ours
am skip reason: subject contains skip directive

Change-Id: I1d600d83f85e13fbbc7c924a7efc546f768c79b7
 2019-07-24 17:14:05 -07:00
TreeHugger Robot cd95311674 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-25 00:09:22 +00:00
Bill Yi 33dec1203c [automerger skipped] Import translations. DO NOT MERGE 
am: ce1f65074a -s ours
am skip reason: subject contains skip directive

Change-Id: Ie99440bbe2c1cb64b9f4e3e714a5178b95e25b3e
 2019-07-24 16:59:47 -07:00
Bill Yi 2792b8483c [automerger skipped] Import translations. DO NOT MERGE 
am: ce1f65074a -s ours
am skip reason: subject contains skip directive

Change-Id: I00d3f746e191d382557fabc0e68be9bbfc3c7a8c
 2019-07-24 16:59:46 -07:00
Bill Yi ce1f65074a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3dd765cbdc830f4e9d4f3dd8495f56a28d8938ba
 2019-07-24 12:43:16 -07:00
Bill Yi 0a5d01f5b1 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iae08b9b0a5055f1c29a678764af6d2f3c849d5ec
 2019-07-24 12:40:37 -07:00
Bill Yi b403889818 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 64302ec808 -s ours
am skip reason: subject contains skip directive

Change-Id: Iff76b4aa4eea5461a0aabffcaef3ecd5ec180db4
 2019-07-14 15:46:14 -07:00
TreeHugger Robot 64302ec808 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-14 22:23:41 +00:00
Bill Yi 51eaf198ef [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: c5999bd8d7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia07d690ca858b4d3558e0fba9e57fa291d53e3fc
 2019-07-14 08:03:10 -07:00
TreeHugger Robot c5999bd8d7 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-14 14:44:18 +00:00
Bill Yi dac2017376 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib15edbefa78b413711bc9a114c035e4f042029d8
 2019-07-14 02:56:47 -07:00
Bill Yi 0e8ed52d25 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I5d3e002b9c8b5b9163674ee55b0a78c86d7a4367
 2019-07-14 02:54:47 -07:00
Android Build Merger (Role) 0c9c6226ed Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab46c2ff33 -s ours am: d61e6b5090 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-14 07:28:02 +00:00
Bill Yi 603754f293 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab46c2ff33 -s ours 
am: 362501b8f6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia5de6bb421696cf6cea9165469e0d46f272cde25
 2019-07-14 00:27:52 -07:00
Bill Yi 0834de5040 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab46c2ff33 -s ours 
am: d61e6b5090 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5196482d572ad09a5918b6c63b8dd2bc9e76be1
 2019-07-14 00:27:52 -07:00
Bill Yi 362501b8f6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: ab46c2ff33 -s ours
am skip reason: subject contains skip directive

Change-Id: Iae288cd40fb18689cac622310b84e7ef2488888c
 2019-07-14 00:18:52 -07:00
Bill Yi d61e6b5090 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: ab46c2ff33 -s ours
am skip reason: subject contains skip directive

Change-Id: I82565b5a973742014900769bd382fb17a001ab52
 2019-07-14 00:18:52 -07:00