Bill Yi
|
b4bd6d0178
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ef6caf7871 -s ours am: da23218146 -s ours
am: 694b005668 -s ours
am skip reason: subject contains skip directive
Change-Id: I59fc09e93793930b15de49f3b49bf29fb6fbdd6a
|
2019-05-18 08:51:00 -07:00 |
|
TreeHugger Robot
|
4df7342918
|
Merge "Import translations. DO NOT MERGE"
|
2019-05-18 15:46:21 +00:00 |
|
Bill Yi
|
49ecbf9e46
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ef6caf7871 -s ours am: 777c7edf00 -s ours
am: e540a1513b -s ours
am skip reason: subject contains skip directive
Change-Id: If75cccb6159b0bbd8be3c5ffffc9d166e60332f3
|
2019-05-18 08:43:55 -07:00 |
|
Bill Yi
|
694b005668
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ef6caf7871 -s ours
am: da23218146 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib316d2f1c096b916702f02b434a74fb76dbacb48
|
2019-05-18 07:50:54 -07:00 |
|
Bill Yi
|
da23218146
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: ef6caf7871 -s ours
am skip reason: subject contains skip directive
Change-Id: I4ff0896ce16ef97cbff7fe5669f11aacce05975a
|
2019-05-18 07:46:42 -07:00 |
|
Bill Yi
|
e540a1513b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ef6caf7871 -s ours
am: 777c7edf00 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib7afaada0e3afcc4fb0ef37f1e5388ca47cf5a8e
|
2019-05-18 07:46:16 -07:00 |
|
Bill Yi
|
777c7edf00
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: ef6caf7871 -s ours
am skip reason: subject contains skip directive
Change-Id: I7cd7d2a2e1e684fa3a85b8f90490584fea834db9
|
2019-05-18 07:40:52 -07:00 |
|
TreeHugger Robot
|
ef6caf7871
|
Merge "Import translations. DO NOT MERGE" into qt-dev
|
2019-05-18 14:28:54 +00:00 |
|
tmfang
|
40a3c660e4
|
Merge "Fix overlapping problem in display size screen." into qt-dev am: 8416839234 am: 3cd9afbc15
am: 246cae7a65
Change-Id: I14a230cf3729601fb651d3d675cf037a26475336
|
2019-05-18 06:28:33 -07:00 |
|
tmfang
|
d8446add1e
|
Merge "Fix overlapping problem in display size screen." into qt-dev am: 8416839234 am: 56c774de19
am: eeffaa3c60
Change-Id: I3de4ed309ea98b02c10a97f09afb6856a4a6af91
|
2019-05-18 06:12:43 -07:00 |
|
Kevin Chang
|
304659d658
|
Merge "Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d am: 56c4f9f254" into qt-r1-dev-plus-aosp
am: cc87686e00
Change-Id: I7cbf454377ef9fc5b6bd3032bd229d113e577d7c
|
2019-05-18 05:56:19 -07:00 |
|
Kevin Chang
|
cf2f505b7d
|
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d am: f8baacfe7f
am: d77b10c7de
Change-Id: I203137b6481999ca75be10996dac8a9e0fd4a71a
|
2019-05-18 05:21:30 -07:00 |
|
Bill Yi
|
ef25f3034d
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Iaa2924d0d22913bbd4f1182c974c6ea5b2e321e0
|
2019-05-18 05:17:15 -07:00 |
|
tmfang
|
246cae7a65
|
Merge "Fix overlapping problem in display size screen." into qt-dev am: 8416839234
am: 3cd9afbc15
Change-Id: I34bdcc2512e95d3e389411e45265cab30173b30a
|
2019-05-18 04:38:28 -07:00 |
|
tmfang
|
eeffaa3c60
|
Merge "Fix overlapping problem in display size screen." into qt-dev am: 8416839234
am: 56c774de19
Change-Id: Id33006b0b5faa3c583b1d1cfdbe0283f34107562
|
2019-05-18 04:33:27 -07:00 |
|
tmfang
|
3cd9afbc15
|
Merge "Fix overlapping problem in display size screen." into qt-dev
am: 8416839234
Change-Id: Ie447001219cb9b7aff9d5c3826b46e9a21d9d109
|
2019-05-18 04:33:21 -07:00 |
|
tmfang
|
56c774de19
|
Merge "Fix overlapping problem in display size screen." into qt-dev
am: 8416839234
Change-Id: I42e4f2ff3b40368f745a6d3b9cb0457893814fe5
|
2019-05-18 04:28:22 -07:00 |
|
TreeHugger Robot
|
8416839234
|
Merge "Fix overlapping problem in display size screen." into qt-dev
|
2019-05-18 11:22:34 +00:00 |
|
Bill Yi
|
8d15e9a685
|
Import translations. DO NOT MERGE
Change-Id: I7f7f22146f8a2bb75a24dd30b81b97ea8a543ab6
Auto-generated-cl: translation import
|
2019-05-18 03:38:30 -07:00 |
|
Android Build Merger (Role)
|
cc87686e00
|
Merge "Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d am: 56c4f9f254" into qt-r1-dev-plus-aosp
|
2019-05-18 08:28:17 +00:00 |
|
Kevin Chang
|
8abb0c3c33
|
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d
am: 56c4f9f254
Change-Id: Ib54bc0af2eab9ad7e372cd43938559440eaa40b0
|
2019-05-18 01:28:07 -07:00 |
|
Kevin Chang
|
d77b10c7de
|
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d
am: f8baacfe7f
Change-Id: Ib84258c2340009a9569e526308fc8114bdd71dea
|
2019-05-18 01:28:06 -07:00 |
|
Kevin Chang
|
f8baacfe7f
|
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
am: f508ece42d
Change-Id: I1c01a995f3cacdd80f5f97bce342dd0ce0907fe2
|
2019-05-18 01:24:02 -07:00 |
|
Kevin Chang
|
56c4f9f254
|
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
am: f508ece42d
Change-Id: I2ea9c4d2afc7c6aaef134159c86ccb50a4467316
|
2019-05-18 01:24:00 -07:00 |
|
Kevin Chang
|
f508ece42d
|
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
|
2019-05-18 08:09:43 +00:00 |
|
Joel Galenson
|
41856191b4
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622 am: 14f64a0acf
am: fffdc8461b
Change-Id: If6cbfecb6a21f4b53e0f8a4f0312be6ad399b2e5
|
2019-05-17 22:42:33 -07:00 |
|
Joel Galenson
|
02ab9a74fd
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622 am: 31db115319
am: e0a10aedd6
Change-Id: Ief4493e730eef4d345e2c7edf725c07a74c9c0c7
|
2019-05-17 22:00:08 -07:00 |
|
Fan Zhang
|
2f730260db
|
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b am: 909b2192cb
am: 856078fc50
Change-Id: I4fe4362b115b2c18d938505d8fb71344fc95bedc
|
2019-05-17 21:58:56 -07:00 |
|
Fan Zhang
|
9842725a23
|
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b am: bc58c1f129
am: b8ac55aec0
Change-Id: I1594f80c15fd663c706164384c463633eedea264
|
2019-05-17 21:57:36 -07:00 |
|
Alexey Kuzmin
|
7a48111584
|
Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7 am: 09bc5975a4
am: 2fc186cef2
Change-Id: I8743f99ec559c848a2ee8159d84d68d156e51bdc
|
2019-05-17 21:56:39 -07:00 |
|
Alexey Kuzmin
|
12f1fc8b94
|
Merge "Play vibration preview when turning on vibration" into qt-dev am: 1a82d653f7 am: aa580944a6
am: 3f6dd2c01d
Change-Id: I969d24144d2ba9f07a4e47c96f2c220e91bf0a98
|
2019-05-17 21:55:43 -07:00 |
|
Joel Galenson
|
fffdc8461b
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622
am: 14f64a0acf
Change-Id: I8413793208a829db4fe1637a22bb16a7181db124
|
2019-05-17 20:35:24 -07:00 |
|
Joel Galenson
|
e0a10aedd6
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev am: 51c92e5622
am: 31db115319
Change-Id: I4ba39337851dc106588a78f871d8457cb23d3205
|
2019-05-17 20:17:02 -07:00 |
|
Joel Galenson
|
14f64a0acf
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev
am: 51c92e5622
Change-Id: I677c4b76f44aa957eddf73d70c3291a4626f4903
|
2019-05-17 19:35:47 -07:00 |
|
Joel Galenson
|
31db115319
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev
am: 51c92e5622
Change-Id: If6446cd203ff92753d6d697e570178cbfd72cd47
|
2019-05-17 19:25:42 -07:00 |
|
TreeHugger Robot
|
51c92e5622
|
Merge "Show the accessibility usage preference when Permissions Hub is disabled." into qt-dev
|
2019-05-18 01:47:09 +00:00 |
|
Fan Zhang
|
856078fc50
|
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b
am: 909b2192cb
Change-Id: I8c789433dc5d31775f5716ac4271b679f76a0637
|
2019-05-17 17:16:08 -07:00 |
|
Fan Zhang
|
b8ac55aec0
|
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b
am: bc58c1f129
Change-Id: I324f3e67e41646fd673afdacc7ee9e59ec5772ae
|
2019-05-17 17:11:18 -07:00 |
|
Fan Zhang
|
909b2192cb
|
Merge changes I06c1bc14,I5415b8ed into qt-dev
am: a83638788b
Change-Id: Ied606e581e3c63e9f6fa4f455959caf4b2870edf
|
2019-05-17 16:43:01 -07:00 |
|
Fan Zhang
|
bc58c1f129
|
Merge changes I06c1bc14,I5415b8ed into qt-dev
am: a83638788b
Change-Id: If774abf9364a66eca020f65a5f2122c1faf5401a
|
2019-05-17 16:32:11 -07:00 |
|
Marc Plano-Lesay
|
336b2baa6f
|
Merge "Make the private DNS mode dialog entries full width."
|
2019-05-17 22:44:15 +00:00 |
|
TreeHugger Robot
|
a83638788b
|
Merge changes I06c1bc14,I5415b8ed into qt-dev
* changes:
Clean up a STOPSHIP string
Fix view overlap in wifi dpp enrollment.
|
2019-05-17 22:41:26 +00:00 |
|
Kevin Chyn
|
82ee26b6c1
|
Merge "De-dupe animation name" into qt-r1-dev am: f0581b95fa
am: 2573421a79
Change-Id: I66cc2633ae230ce1eaf5c2fd0483e333f47e65b1
|
2019-05-17 14:48:45 -07:00 |
|
Xin Li
|
236d27b93f
|
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." am: 0a8e4aebf5 -s ours am: 148da1edf8 -s ours am: 5f726765e5
am: 62b108d19f -s ours
am skip reason: subject contains skip directive
Change-Id: I358e13d6d0e3db61fc8fb71eb5bd553dcee9031e
|
2019-05-17 13:52:04 -07:00 |
|
Fan Zhang
|
1f8cc8f96d
|
Clean up a STOPSHIP string
Bug: 110557011
Test: rebuild
Change-Id: I06c1bc1460cbb47feb6152298151477549a9e411
|
2019-05-17 13:44:01 -07:00 |
|
Fan Zhang
|
a10d3cfc78
|
Fix view overlap in wifi dpp enrollment.
Fixes: 132813855
Test: visual
Change-Id: I5415b8edaf1ce5ae122e4d1ee41e65ca825f72e6
|
2019-05-17 12:58:50 -07:00 |
|
Android Build Merger (Role)
|
f16d4fb7a7
|
Merge "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57 -s ours am: af42065ea6 -s ours am: e5107ffba2 am: 0d61126115 -s ours am skip reason: subject contains skip directive"
|
2019-05-17 19:32:24 +00:00 |
|
Xin Li
|
4ee7ab0563
|
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master. am: 87f090ba57 -s ours am: af42065ea6 -s ours am: e5107ffba2
am: 0d61126115 -s ours
am skip reason: subject contains skip directive
Change-Id: I5ec8b2d026af0106c90e71769f23562fc8558b14
|
2019-05-17 12:11:25 -07:00 |
|
Android Build Merger (Role)
|
18a8434165
|
Merge changes from topic "am-4f4390cd81144667b143214eb38ca2b9"
* changes:
Merge "Modified string" into qt-r1-dev am: 4a6d3f6403 am: a396a8c1ba
Added information icon am: 8fd6269f40 am: f5cbb30b04
|
2019-05-17 19:11:03 +00:00 |
|
Joshua Mccloskey
|
084f457ab8
|
Merge "Modified string" into qt-r1-dev am: 4a6d3f6403
am: a396a8c1ba
Change-Id: I191cc36f99334b4fa9f53aecc905ba68d066b366
|
2019-05-17 11:50:59 -07:00 |
|