Commit graph

41755 commits

Author SHA1 Message Date
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
7d2c3341c3 [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
am: 197cf7dad0 -s ours
am skip reason: subject contains skip directive

Change-Id: I7f9d7180172038c83cd8c1f87541b213a8bc7004
2019-08-14 15:48:49 -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
450f30db4d Import translations. DO NOT MERGE
Change-Id: Ie360fef58d520aab88d9ac91fcd241f9dd2dbbb2
Auto-generated-cl: translation import
2019-07-29 12:05:20 -07:00
Bill Yi
1c659abb4e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: cd95311674 -s ours am: 1080d669ab -s ours
am: 1e4d00401d -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I971adb3c569607da7a5724da34904d2a45f0d8d5
2019-07-24 17:47:18 -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
TreeHugger Robot
4fd7107c8b Merge "Import translations. DO NOT MERGE" 2019-07-21 06:42:29 +00:00
Bill Yi
87ad4c979f Import translations. DO NOT MERGE
Change-Id: Ice306f134cebf3e690c82a7b2d1323e3021e7980
Auto-generated-cl: translation import
2019-07-20 01:50:32 -07:00
Bill Yi
317f27da90 Import translations. DO NOT MERGE
Change-Id: Ia43c3b9683afca77e14a783a540bb0544476cb9d
Auto-generated-cl: translation import
2019-07-20 01:50:16 -07:00
Bill Yi
b69aaf4750 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 64302ec808 -s ours
am: b403889818 -s ours
am skip reason: subject contains skip directive

Change-Id: I2437556ccbcaf0d5595f3269a7b6f8fad12cf1b9
2019-07-14 15:55:16 -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
5bb4b60470 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c5999bd8d7 -s ours
am: 51eaf198ef -s ours
am skip reason: subject contains skip directive

Change-Id: I7dafb531aafde66c3cb48163f80e2b3578410828
2019-07-14 08:09:10 -07: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
Bill Yi
516aa30464 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab46c2ff33 -s ours am: d61e6b5090 -s ours
am: 0c9c6226ed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e9a8b917e7237eb100db629a68a6f3cbccf283e
2019-07-14 00:36:53 -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
TreeHugger Robot
ab46c2ff33 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-07-14 07:08:55 +00:00
Bill Yi
530bcd817a Merge "[automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1 -s ours am: e3d501996e -s ours
am: 24d4024df1 -s ours
am skip reason: subject contains skip directive

Change-Id: I31c84a13ebde95fffa104e7d21aeed4398df5e65
2019-07-13 22:49:21 -07:00
Bill Yi
442c90cebd [automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1 -s ours am: 7b644d7f78 -s ours
am: 204c916181 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd67e2560c0aac749400decff59215e388c64ec0
2019-07-13 22:49:03 -07:00
Android Build Merger (Role)
24d4024df1 Merge "[automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1 -s ours am: e3d501996e -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-14 05:40:13 +00:00