Commit Graph

53035 Commits

Author SHA1 Message Date
Salvador Martinez
c5df8f0cb4 Merge "Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921 am: a7fba3efe2" into qt-r1-dev-plus-aosp
am: 5465e927e3

Change-Id: Ib241cacc398aff9cad18e42c3f4d5762a0cb80a7
2019-05-21 02:41:16 -07:00
Salvador Martinez
d3f0b756e5 Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921 am: 9822f6ed92
am: 768e021974

Change-Id: I45bf3a5f3cb42d78a3feaf02bdedd2372167e12d
2019-05-21 01:32:19 -07:00
Android Build Merger (Role)
5465e927e3 Merge "Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921 am: a7fba3efe2" into qt-r1-dev-plus-aosp 2019-05-21 00:58:50 +00:00
Salvador Martinez
768e021974 Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921
am: 9822f6ed92

Change-Id: I3805df6ebe38197a128ce21bc83a6ad7474c8019
2019-05-20 17:21:03 -07:00
Salvador Martinez
9f969189e5 Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921
am: a7fba3efe2

Change-Id: I27b3e8157c6957f15db3512615a738a5d9bc7efd
2019-05-20 17:18:23 -07:00
Salvador Martinez
a7fba3efe2 Merge "Break infinite refresh loop in battery estimates" into qt-dev
am: e418874921

Change-Id: I05f1402b1510a3008ef0e5beac4262762b9dbc1c
2019-05-20 16:05:21 -07:00
Salvador Martinez
9822f6ed92 Merge "Break infinite refresh loop in battery estimates" into qt-dev
am: e418874921

Change-Id: Ibf5d75ffec22c0948d89c3cdfc5feb7197869f30
2019-05-20 15:21:12 -07:00
Salvador Martinez
e418874921 Merge "Break infinite refresh loop in battery estimates" into qt-dev 2019-05-20 21:22:23 +00:00
Narayan Kamath
0d1dc2bd59 Merge "Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd am: 4f6e6c0849" into qt-r1-dev-plus-aosp
am: 2ce63571d9

Change-Id: I9a0ed23fb54dbb4d3cd36d216b03ef6dcd491b72
2019-05-20 10:48:27 -07:00
Narayan Kamath
6abd1e82d2 Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd am: c756190b9c
am: 35870d6e5b

Change-Id: I46ef78848acec0f723719fdf778ff9a828d0fb85
2019-05-20 08:24:12 -07:00
Android Build Merger (Role)
2ce63571d9 Merge "Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd am: 4f6e6c0849" into qt-r1-dev-plus-aosp 2019-05-20 14:16:31 +00:00
Narayan Kamath
cb3df9aaa5 Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd
am: 4f6e6c0849

Change-Id: I96e051241ff9a787d570c6f3390f23381b2cda38
2019-05-20 05:53:46 -07:00
Narayan Kamath
35870d6e5b Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev am: 76cf0dbddd
am: c756190b9c

Change-Id: Id0b6d238471148c51948144795b7c81f1913839a
2019-05-20 05:52:08 -07:00
Narayan Kamath
c756190b9c Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev
am: 76cf0dbddd

Change-Id: Ic097d7c264bbc198c0ef3c0ed9099beb9339a2e0
2019-05-20 05:14:33 -07:00
Narayan Kamath
4f6e6c0849 Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev
am: 76cf0dbddd

Change-Id: I660159218ef2598a7df5c84f6837bcfc4b0b22f1
2019-05-20 01:12:27 -07:00
Narayan Kamath
76cf0dbddd Merge "Hide AppButtonsPreferenceController for system modules." into qt-dev 2019-05-20 07:42:53 +00:00
Bill Yi
186a81b5b3 [automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours am: 089d85f315 -s ours am: d109c07b0d -s ours
am: 4e27bd6e44 -s ours
am skip reason: subject contains skip directive

Change-Id: I16a0692bb997500629bcf325db96460864ed626a
2019-05-18 15:30:53 -07:00
Bill Yi
352226d549 [automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours am: 089d85f315 -s ours am: 68951dc3c4 -s ours
am: a97bd72607 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib6c40311a2f8566abccfcbd4c7b1bc4dc2ad2530
2019-05-18 15:30:19 -07:00
Bill Yi
4e27bd6e44 [automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours am: 089d85f315 -s ours
am: d109c07b0d -s ours
am skip reason: subject contains skip directive

Change-Id: I6bf9d5d76ee47cc406048e7433b37ee22c966846
2019-05-18 15:25:33 -07:00
Bill Yi
a97bd72607 [automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours am: 089d85f315 -s ours
am: 68951dc3c4 -s ours
am skip reason: subject contains skip directive

Change-Id: Iec537b954ed7e258a7f618efc32361ccf4e71449
2019-05-18 15:25:17 -07:00
Bill Yi
68951dc3c4 [automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours
am: 089d85f315 -s ours
am skip reason: subject contains skip directive

Change-Id: I47b4a5a91a63b350f46fe1243e612a090a01d407
2019-05-18 15:20:29 -07:00
Bill Yi
d109c07b0d [automerger skipped] Import translations. DO NOT MERGE am: d6d1ac5e87 -s ours
am: 089d85f315 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifa2b1317cefa553615957d2caa866d260e1c8395
2019-05-18 15:20:17 -07:00
Bill Yi
089d85f315 [automerger skipped] Import translations. DO NOT MERGE
am: d6d1ac5e87 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic6626c84da89b05066387585c87a7cade7a85e22
2019-05-18 15:15:15 -07:00
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
Bill Yi
d6d1ac5e87 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I69697c36e862b2725dfd7fa1f542f9f7a3c6fa03
2019-05-18 06:44:53 -07: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