Commit Graph

41731 Commits (4d4586f74391f5bdcd960c6221c09adb3a00a7bc)

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 65d39ab580 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ccb19fdda7 -s ours am: 78650efb26 am: e1b597cee6
am: d29ac85675 -s ours
am skip reason: subject contains skip directive

Change-Id: Iee3272a5ed1340ebc08017daecf6357b8f9d64ba
2019-09-05 14:45:49 -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 ccc704609c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 7b9006e18c -s ours
am: 7735923c52 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6724ee7e792afb3f1548724e011446812174211
2019-09-03 13:02:28 -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 6ce25ae20b Import translations. DO NOT MERGE
Change-Id: I0ad8850037ed50c05776751727c707231671f520
Auto-generated-cl: translation import
2019-08-30 10:51:13 -07:00
Bill Yi 35ae1b2a57 Import translations. DO NOT MERGE
Change-Id: I80a179ff64845d9e2d5783f5aa0f1db0dfc4cd15
Auto-generated-cl: translation import
2019-08-24 14:00:51 -07:00
Bill Yi 4faa320719 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 4492996f04 -s ours am: 3071857e03 -s ours
am: 527eeca672 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80a91810ee70f3e11debacc58f6ac835257be210
2019-08-19 14:12:17 -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 98bdd8379b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 4492996f04 -s ours am: c3211cb040 -s ours
am: 021da087d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I87ed8010af35abc4a80f5e5559bcecc7871d6af0
2019-08-19 13:49:37 -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 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