Commit Graph

93842 Commits

Author SHA1 Message Date
Automerger Merge Worker
e28351b5bd Merge "Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 48efcc5547" into sc-v2-dev-plus-aosp am: 6f1fa17967
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I131e90d3b9bee09242a0c9ce5787ebd82e8d46ea
2021-08-18 18:46:47 +00:00
Neha Jain
44ea43dc31 Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 92171172ec am: 0b96b6d13b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: Id7ca862cf98c856f8737a6f21e5ba0ef03e64234
2021-08-18 18:46:34 +00:00
TreeHugger Robot
f30f4b4dac Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d am: e39485b4b2 am: f87021b354
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651

Change-Id: I2e2007349d8bf2cf1b3d83fd1f50f84c3d9132e5
2021-08-18 18:46:09 +00:00
TreeHugger Robot
b1ca0b6db2 Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d am: a513ecb2da am: 8fc64966fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651

Change-Id: Ibc9082d528bbc161f0f8e6177feb6d4ac219eae6
2021-08-18 18:45:56 +00:00
Automerger Merge Worker
6f1fa17967 Merge "Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 48efcc5547" into sc-v2-dev-plus-aosp 2021-08-18 18:31:28 +00:00
Neha Jain
ba1178c72d Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 48efcc5547
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I5d4dd3e9aaeb60c0b9e6fb3e600fa923921930c9
2021-08-18 18:31:25 +00:00
Neha Jain
0b96b6d13b Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 92171172ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: Ic16ea6b43b4ee5cfc2a7d1f1e9a3287d62ab491c
2021-08-18 18:31:24 +00:00
TreeHugger Robot
f87021b354 Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d am: e39485b4b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651

Change-Id: I2d4a4a4c3e261030684411330b6509df9a548e5b
2021-08-18 18:31:09 +00:00
TreeHugger Robot
8fc64966fa Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d am: a513ecb2da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651

Change-Id: I7abe37232b3d60328d1c67f36b61057ea2399b76
2021-08-18 18:30:59 +00:00
Neha Jain
29e559d242 Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: fa31f577ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I700a833898d2e34bfd9a0621ef85d9005ff5628b
2021-08-18 18:25:42 +00:00
Neha Jain
48efcc5547 Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I59640625b9f47dd7493acb0d919b6680e1f25660
2021-08-18 18:12:52 +00:00
Neha Jain
92171172ec Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I575d9f32e028249f49360b37dacfab9df9404e7f
2021-08-18 18:12:40 +00:00
TreeHugger Robot
a513ecb2da Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651

Change-Id: Ia854e365a828137bcc3f6d112695ed2b1c051313
2021-08-18 18:12:32 +00:00
TreeHugger Robot
e39485b4b2 Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651

Change-Id: Ibe5966344f9c2ca2e13b40bdc6b69ebb0342f169
2021-08-18 18:12:23 +00:00
Neha Jain
bc0cf0d87f Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I04fdc7c76285de7ad43b83846de10a377eb4f151
2021-08-18 18:12:08 +00:00
Neha Jain
fa31f577ca Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674

Change-Id: I56b549ffb3b76f8004b447e973e2e35e6d77e53c
2021-08-18 18:11:21 +00:00
Neha Jain
abd0f6a5f6 Merge "Remove CDM entries in Connected Device." into sc-dev 2021-08-18 18:01:00 +00:00
TreeHugger Robot
190603f53d Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev 2021-08-18 17:56:51 +00:00
Calvin Pan
79d30d2fcc Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc am: 186ea2cd3b am: f2711c3e59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I30a027ed9b46e2fe82eccef6219c746ae5c1286b
2021-08-18 07:17:28 +00:00
Calvin Pan
56e69be776 Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc am: f687c1ea61 am: cad9603b2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I4c658c6069af494db9c01c5a7b809c45a5c38b5f
2021-08-18 07:17:05 +00:00
Calvin Pan
f2711c3e59 Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc am: 186ea2cd3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I9c002966cafac1352c1f5e731b36316b31c2bd4f
2021-08-18 07:06:13 +00:00
Calvin Pan
cad9603b2e Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc am: f687c1ea61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I9fef74a954ee2ab03037e4c3abaa2539749f8d9e
2021-08-18 07:05:33 +00:00
Calvin Pan
f687c1ea61 Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I27ae050157e9143c0472d4e18ad7c29dab42d8c2
2021-08-18 06:56:25 +00:00
Calvin Pan
186ea2cd3b Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134

Change-Id: I78ee6b2fb68ba44682e33cc6dbaaee6a64cba608
2021-08-18 06:56:25 +00:00
Calvin Pan
abb8a6abdc Merge "Remove unnecessary condition" into sc-qpr1-dev 2021-08-18 06:43:59 +00:00
TreeHugger Robot
b7680ac22a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: ebdc111881 -s ours am: a395f188e1 -s ours am: c27be2ae19 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591581

Change-Id: Ib350f5e2c470d1745cc6ca3aea90e56113d6bd98
2021-08-18 01:43:29 +00:00
TreeHugger Robot
0a314e4ce0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: ebdc111881 -s ours am: 87231f645a -s ours am: 4910632334 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591581

Change-Id: Id7660351ee19aa7118be81272f15e29f6f721e96
2021-08-18 01:42:35 +00:00
TreeHugger Robot
fbee52192e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: c3d27dad60 -s ours am: f30d081a94 -s ours am: 95d74f01f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591581

Change-Id: I599fd30b8a054ee33340186ee9cdf9f5f4a7789f
2021-08-18 01:41:28 +00:00
Bill Yi
94d6ca6d72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -s ours am: dda7bf46cf -s ours am: 2b29686be9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: I38c290797387f32d1bbb0f1e91c7648628218ada
2021-08-18 01:40:30 +00:00
Bill Yi
2ca2c8668d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -s ours am: fa45968616 -s ours am: 8e9f6de18c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: I628490c5c4cfb828b99d30a92fa0062e9565c604
2021-08-18 01:39:59 +00:00
Bill Yi
6506c456b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -s ours am: 634884e7ba -s ours am: 1a11a32a56 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: Ia030f32954b8c0d24b3f6a749513850c0243c995
2021-08-18 01:39:13 +00:00
Bill Yi
227448ae2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -s ours am: 28c5c2fdb6 -s ours am: a618b7d2a3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: I603331ec100ee06ba4644135ceaa5f8dec30f8d6
2021-08-18 01:38:28 +00:00
Bill Yi
026e1df278 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: f3da5afffa -s ours am: db14bcbe3b -s ours am: cd7094b9a9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: I67cb574b2c6cc90574386eabf0ea54ac3600b202
2021-08-18 01:37:22 +00:00
Bill Yi
0a0ac24557 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 63f455688c -s ours am: 1492ac1bfd -s ours am: 1804f4e0af -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: I5a10dc4bb6c6fbd7aceb2793f002636df07185e6
2021-08-18 01:36:54 +00:00
Bill Yi
d4467ece43 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp am: 6b6e3e88b9 am: aeb3f24e59 am: 08d2af9e10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: I0a5b4f86a556982f78b8c3639989203a4fd5cc70
2021-08-18 01:35:43 +00:00
Bill Yi
2f6fec9abb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb am: 635d7a2949 -s ours am: 743457a225 -s ours am: d12cbd225b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: Ic02b48eef8970c03d3637abe49aa8c1d11a7aae6
2021-08-18 01:35:40 +00:00
Bill Yi
d1b2aedb53 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-dev-plus-aosp am: 4d1a339b98 am: 1abe5e1740 am: 1da245f5af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: Ie0c9affad374a02c47e02a07384243424d4ac821
2021-08-18 01:34:16 +00:00
Bill Yi
95b6f76082 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb am: cd0d73535b -s ours am: dabdae9adb -s ours am: 1d630b2e6e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: I5b58d546425070fdf24327b2a0635809ddaa2184
2021-08-18 01:34:14 +00:00
TreeHugger Robot
abcdb9b66f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 345eec506d -s ours am: dc69206b6e -s ours am: cb38d31a13 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590649

Change-Id: If144a01bbda00baaddd6ed6862a2e8166eeb8b2f
2021-08-18 01:29:48 +00:00
Bill Yi
a9ced00b13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: f8f7afe889 -s ours am: 79e8d066ef -s ours am: 06955416e4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590652

Change-Id: I0d5aad2f3573189c39dbf8b0c02c75690553a423
2021-08-18 01:28:32 +00:00
Bill Yi
c1bab4a77b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 1ca3b46718 -s ours am: 11895d923a -s ours am: b0173be441 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657

Change-Id: I92d0a7133750d53d80ec47a739aad5358ed05176
2021-08-18 01:26:44 +00:00
Jordan Jozwiak
84fff1384d Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev am: 5da0ca8a14 am: 8df6b505af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15547175

Change-Id: I9453a12a4bfe6e79e3a19a7371bba7ab03215a39
2021-08-18 01:12:01 +00:00
TreeHugger Robot
5e51e123dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours am: 6ac0521fc9 -s ours am: 3365e403a4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590649

Change-Id: I98eb37cde2cded2a2a9feaed2017b5e9290ff8a2
2021-08-18 00:36:41 +00:00
Bill Yi
abd43900df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours am: 0ffadc1caf -s ours am: 7b49f388eb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590652

Change-Id: If391f264b0fe71c21ef43c394f36023b6c2def98
2021-08-18 00:36:35 +00:00
TreeHugger Robot
24911ae517 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours am: 99036fe183 -s ours am: c16965f2a4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590649

Change-Id: I25c490d34f61dcbbbaf3f076cee47f809a8f286b
2021-08-18 00:36:30 +00:00
Bill Yi
7fa35a5808 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours am: 9f379245bb -s ours am: 528d97bbee -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590652

Change-Id: Iefd1ea9870a83cad04af97d6ba7a6e3462bd816b
2021-08-18 00:36:23 +00:00
Bill Yi
b9d4c914cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours am: 48bd94aad3 -s ours am: c8aa2fc52f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657

Change-Id: Ibaa1d36ade6414aae7fdf02666e60847dc1f8d85
2021-08-18 00:36:17 +00:00
Bill Yi
5dd1ed611f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours am: baf3a8b3bd -s ours am: 7c14455c8b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657

Change-Id: Ib4897841fe30027c86d7c599ca2a5220356e16fb
2021-08-18 00:36:11 +00:00
TreeHugger Robot
8266bf76fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours am: ed4f4693c2 -s ours am: fe24c2c1ce -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591584

Change-Id: Ib218221dee4e3097e951223ef19e19171dcf5bbc
2021-08-18 00:36:05 +00:00
TreeHugger Robot
ac33be89e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: d9754e6900 -s ours am: 150a09b784 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591591

Change-Id: Iaaff37379b6130b117ec0013fe5a0bf13d1e1ddf
2021-08-18 00:35:59 +00:00