PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,017 Commits 1 Branch 0 Tags
47b9f7707c2bf826c0947ba13857458daf194bcc
Commit Graph

106017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinyi Zhou
aafebb3890 Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab am: 4be70892e9 am: 815bbd8c1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I878e145a67fd799b5868af4a5e15b196cd6f985a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:32:17 +00:00
Bonian Chen
c89e39cd76 Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 313284a9ae am: 6ed05ee86f am: aaf90b2592 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: Ie71920caa92f6ebba0d89b477f98546658286733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:32:09 +00:00
Automerger Merge Worker
05b15207dd Merge "Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: b16261a8e1" into tm-d1-dev-plus-aosp am: 2e0303ef25 am: 1b777b7d8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009

Change-Id: I03fb323ada5e32b1f9d22c271d81ac2481eeb077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:32:02 +00:00
Bonian Chen
fcae58a2be Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 935706425d am: 3a21d96f32 am: e09189620d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: I3245b06427f7cf9cc4fdf49a665d7b11672dc258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:31:54 +00:00
Bonian Chen
0771bd29da Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11 am: a9026bb486 am: 6fdeff527b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673

Change-Id: Idb92dabecec6d5a9e74119e5e3f694c6d78b2155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:31:46 +00:00
Yuri Lin
12cc159635 Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: 0e7619f290 am: 16a5535dd3 am: 9bc2aff5d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009

Change-Id: I7bc99887fbb074656f3fc9a9e5db1daa2549b751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:31:37 +00:00
Lais Andrade
3a911d3ccc Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d am: 4e60155f11 am: b34d581d2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: I65d89470d033723d85c8aa2f418ab0c7ff201b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:31:20 +00:00
Bonian Chen
54b7f79b9e Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: f211a82f23 am: fc454f31aa am: 0c22cd1ddd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673

Change-Id: I0aebd13b436ef49d6a9e93e0f98f753579d632c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:31:12 +00:00
Lais Andrade
fa9ed2d41f Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: e673e22181 am: ae1ae56fb2 am: b760de645d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: Ia26878f9d31b799e5754ef7d61ac83ac575eec16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:31:03 +00:00
TreeHugger Robot
e9142fecc0 Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 54467e3eb8 am: 966e1e8e49 am: e0c25fddba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068

Change-Id: I59b56a22f116be58cbc6ecfb6e551779fd136938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:30:56 +00:00
Bonian Chen
d881a708e7 Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 313284a9ae am: 5b79b590c4 am: 14ccecd03b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: Ie0af96828067f7b2216aaca7b456fad8f5bb9554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:30:48 +00:00
Yuri Lin
a943c50963 Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: b16261a8e1 am: 8a3c983398 am: 727d912d0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009

Change-Id: Ie628eca1e752b3dfd3c20284ba969a7d367a8a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:30:39 +00:00
Bonian Chen
57b410e60f [automerger skipped] Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11 am: a725b0c3da am: 3c4956b7c4 -s ours 
am skip reason: skipped by user bonianchen

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

Change-Id: I1b4dffff12aa041da05d6b021f23e3fbb5dde7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 05:23:42 +00:00
Julia Reynolds
312de956ec Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev 2022-04-29 05:11:26 +00:00
TreeHugger Robot
fc6cb73d29 Merge "Hide running time information for "Android System" entry" into tm-dev 2022-04-29 04:32:41 +00:00
Lais Andrade
9cae3d694e Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d am: 109b181126 am: 94c826bda7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: Ic300a4b801c9ae8ce49f6378a381703eddd5a8df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:04:59 +00:00
TreeHugger Robot
8e5cb44ef8 Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 39cbfbfed5 am: c1cdae7699 am: 9a9d90d8d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068

Change-Id: I4a1ece82b2d6a5b6e71b312f0b194f51b6355b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:04:51 +00:00
TreeHugger Robot
a8db6377ae Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 39cbfbfed5 am: 094cde648b am: 520db6c09d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068

Change-Id: I66719a2e391fc5ac42a535248015397f35b3c9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:04:40 +00:00
TreeHugger Robot
2a68a9354a Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: b0bf5dd13f am: 46dda94691 am: 61e4005b0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: I979acae3527b1568e6aef564fbdeaa285c082bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:04:32 +00:00
TreeHugger Robot
8115c62073 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: aee4b8e3d4 am: 2a742b1774 am: 8325e40813 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: I3023898eb2e61a11b8c48a680522b3196d1757fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:04:24 +00:00
TreeHugger Robot
9686842b72 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: aee4b8e3d4 am: 8f618ea83a am: fae9bbbb2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: I925614cdac0ed03045d9816c2de8cdf28cbedc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:04:17 +00:00
Alex Johnston
d041599d3f Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: 56807e16f5 am: 447dae8143 am: a08ffe1256 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I34a49042446e4ddddb7b5f71348ad99db9771584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:04:03 +00:00
Alex Johnston
0c0704b6f7 Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: d45cab5850 am: 8f02d3da63 am: 636bf7d186 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I023cc0163336902473fb87757c16a0bc2b4fca74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:03:55 +00:00
Alex Johnston
a6016441f9 Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: d45cab5850 am: 8229b0fbf7 am: f8ee374a19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I4f50807a6c72db3534c32dd94440760e3a820e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 04:03:45 +00:00
Calvin Pan
8ad2642b5f Merge "Add unit test for AppLocalePickerActivity" into tm-dev 2022-04-29 03:56:56 +00:00
Betty Chang
7711207ba5 Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev 2022-04-29 03:33:55 +00:00
Amy Hsu
19b9978591 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev 2022-04-29 03:25:34 +00:00
ykhung
1c3cb4505c Hide running time information for "Android System" entry 
Hide the running time information for "Android System" entry, since this
entry will combine multiple system components together. It will provide
incorrect running time information. The getRealUid() method maps many
UIDs to Process.SYSTEM_UID(1000), which results in combining all of
those UIDs into one "Android System" entry. This is the expected behavior.

Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I0aece0f1e86c36e55a2b5a966b4da9fdea14c748
 2022-04-29 02:40:07 +00:00
TreeHugger Robot
96e12783cc Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-29 02:36:28 +00:00
TreeHugger Robot
999a1b3b9d Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-29 02:36:28 +00:00
TreeHugger Robot
611db9e8be Merge "Remove loading spinner from Premium SMS access" into tm-dev 2022-04-29 02:30:14 +00:00
Weng Su
931ec6fdda Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: b53c4ddcec am: 0f036c9a27 am: 952ba0d0de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: I2dd747f77c26d4d891934d489b9dca446c896b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:48:08 +00:00
Weng Su
9d36e760d2 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: 6428d536c6 am: 977f9577a1 am: 705da26629 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: I7369563a267dd663e4a2bae5c4a51339efd1956e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:46:57 +00:00
Weng Su
9236023e32 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: 6428d536c6 am: 342e16a4c1 am: ad513bf05f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: I6eb0d483460ece9d431d8d15caf896254a298121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:41:54 +00:00
Automerger Merge Worker
74a3ea6500 Merge "Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: a01cbf2774" into tm-d1-dev-plus-aosp am: fa2ba5bc88 am: 426722502b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: Ie16bb23466493bd3592d3bbbd383b6dfe4a14fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:40:03 +00:00
Stanley Wang
c41656ce63 Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: 6a58c2faf1 am: 4ff1183209 am: 1ae40c50a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: I48ea2558b1af95a3913ac9cd87f966469d95184b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:55 +00:00
Stanley Wang
f2369c17ac Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: 6a58c2faf1 am: ff185afde7 am: 79513e38bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: Ia7d0739e785dbaae792ace9f0b605abf6e5c524c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:47 +00:00
Automerger Merge Worker
acb10392a9 Merge "Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: 3e1e0cd837" into tm-d1-dev-plus-aosp am: d8bcd8b4b5 am: e563a0a15a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: I089be8d49dc94ab7bf6701f568c450f2b753ef88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:40 +00:00
TreeHugger Robot
5404869e4f Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: a715a3c7b9 am: 3db1366221 am: a3ea2e28df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: I0bb8226ea6e0013928eb31b1acf585e1e2c852de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:30 +00:00
TreeHugger Robot
da8add91e4 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: a715a3c7b9 am: 01753159e5 am: e1d863f156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: Iad1f82dbb7b5cfdc65c609440fbca069c408b5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:22 +00:00
Hugh Chen
f127958f8b Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 07089739be am: 14984ce5ca am: 035a9dd4e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: Id83a94444bc3ba342b6c9baaa56d5a16c2ffa22e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:14 +00:00
Hugh Chen
b82740fc8b Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 07089739be am: 3aaf35cac1 am: a01f125313 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I9398541e8a0afabbb470382fe5f1348ecbbb30f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:39:07 +00:00
Hugh Chen
14bcede2c6 Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: dcd868531f am: f42f401c1d am: ecb9508fef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I45d4017390fc47c762c4f0f4946dff220de73256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 01:38:58 +00:00
YK Hung
55fcb02aca Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev 2022-04-29 01:14:33 +00:00
Joshua Mccloskey
29f7b04f35 Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb am: 3fd02b1492 am: da01a1b5c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: I3a3b71246e647674427a4d58d37431a65b4d6be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:51:57 +00:00
TreeHugger Robot
baaaeb3de4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -s ours am: ae8bd84a09 -s ours am: 8838625058 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1aa05c86e7b3f264dde83db47932fe74f85f5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:46:21 +00:00
Bill Yi
31f47d9a65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours am: a0048fb9cf -s ours am: aed191087f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc238c6207fdee0dc49261c58e096d70ddb48564
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:46:07 +00:00
Joshua Mccloskey
b7af67653a Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb am: 5ba13f2c14 am: c128e0423c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: Ib6dc297089e88508ed05fff60a05639783576b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:44:14 +00:00
TreeHugger Robot
8222876198 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -s ours am: 4df4520afd -s ours am: efc499a2ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86c147337743ac66db9b45ba1035aa1556f3d87a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:38:15 +00:00
Bill Yi
cb997c2a6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours am: afc0b47d1b -s ours am: 4aa1d180cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0ecfcbec89eeb29deaa4d3ecfcedfbacbfd609e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:37:57 +00:00