PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,443 Commits 1 Branch 0 Tags
d951e2a0481af3e88fca67a35e0a9322d045459c
Commit Graph

121443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zaiyue Xue
1ee1cc368f Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: I7c47d61fd6cf6f1662dc77e7bf744b71f393a7be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:31:44 +00:00
TreeHugger Robot
f9ef8e39f5 Merge "Fix b/270656372 unit test failure." into udc-dev 2023-02-24 13:06:28 +00:00
Zaiyue Xue
ae0d935dcc Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev 2023-02-24 12:55:21 +00:00
Vincent Wang
35ec32bb18 Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I0017be373d3a5003913fd9d9fa86c2c8ced16c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 12:19:09 +00:00
Vincent Wang
d17704196f Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev 2023-02-24 11:42:26 +00:00
Zaiyue Xue
6d939b34dc Fix b/265387286: The total percentage of all apps is not 100% 
Bug: 265387286
Fix: 265387286
Test: manual
Change-Id: I654f8211a45c818f9a2d4867ac679e72c9ce6eb1
 2023-02-24 19:19:28 +08:00
Zaiyue Xue
d4dbf039ea Fix b/270656372 unit test failure. 
Failed test: sendBatteryEntryData_nullBatteryUsageStats_sendFakeDataIntoProvider

Bug: 270656372
Fix: 270656372
Test: presubmit
Change-Id: Idd1b3be07ec72c3cf7050b96e5320d67dcdc5463
 2023-02-24 19:13:50 +08:00
TreeHugger Robot
5d32369ec8 Merge "[Settings] Re-enable previous work on data saver" into udc-dev am: fa57dd3f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578800

Change-Id: I090cef5138a424af861d3e2a306c8f8657c421d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:49:58 +00:00
Tom Hsu
ad6359cfbb Merge "Switch off Calendar UI fo regional preferences" into udc-dev am: 7e2ea92559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578799

Change-Id: Iea1de3d7bfe3db293deed904c1459da57478d6cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 10:48:26 +00:00
TreeHugger Robot
fa57dd3f2e Merge "[Settings] Re-enable previous work on data saver" into udc-dev 2023-02-24 10:15:32 +00:00
Tom Hsu
7e2ea92559 Merge "Switch off Calendar UI fo regional preferences" into udc-dev 2023-02-24 09:47:01 +00:00
Vincent Wang
882b49c8fb Refactor FingerprintEnrollEnrolling to fragment 
Bug: b/260957933
Test: NA
Change-Id: I281ec7a7373f6863e2e6f8f20bbbb01fa01e009a
 2023-02-24 08:43:17 +00:00
Arc Wang
1596a2838d Allow Magnification Settings launch from outside of AccessibilitySettings 
Before this CL, Magnification Settings can only be
launched from MagnificationPreferenceController.

This CL initializes FooterPreferenceController if the
parent class does not initialize it from Intent extras.

Bug: 268411305
Test: manual
      make RunSettingsRoboTests ROBOTEST_FILTER=MagnificationGesturesPreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I954739c39c823ce7fe0daa711743f729d182571b
 2023-02-24 15:56:43 +08:00
Charles Chen
84c1cbe2cd [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours am: 4aaf6c191b -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: I6c496790a26b516bf003aefc30e9bb52ff816727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:38:36 +00:00
TreeHugger Robot
8748b299bb Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev am: 802bff9092 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517325

Change-Id: Ied1b19f97d2c170c21c00f4425b54bbb494eb6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:33:20 +00:00
TreeHugger Robot
76baf341d2 Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693

Change-Id: Ia72afbbe0cdc696dc42e84e199374bf2ef993cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:30:34 +00:00
Angela Wang
2b4830720c Fix duplicated order in notification settings layout 
There has 2 preferences with android:order="18" in the xml. Reorders all the preferences to remove the duplication.

Bug: 270638515
Test: manual test
Change-Id: I275effcd0e8a9c304dc045e17086fdb688be96b7
 2023-02-24 07:15:29 +00:00
Daniel Huang
3b00f28b6f Merge "Change key name "Meta" to "Action key"" into udc-dev am: 6e6b067863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21552503

Change-Id: Iad85e0c130b774e9df08aa75df5ed08467280d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:14:40 +00:00
Zaiyue Xue
d99ae387d8 Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev am: 2959831d59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546834

Change-Id: I9f64cc6e3a11f76ee920b557ad5ec6d77dc5f73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:13:30 +00:00
Avinash Vadlamudi
d4e541f101 Merge "[Auto Pin Confirm]: Fix the usage of LockPatternUtils#isAutoPinConfirmFeatureAvailable method" into udc-dev am: 2a619718ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537112

Change-Id: Ic83e6680667c7231d964a0beca11a7382aa89fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:06:00 +00:00
Bonian Chen
7bfa22df7b Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev am: 7d76797f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548828

Change-Id: I07f82db18158882064867dd628e0227c2e30ef3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 07:03:43 +00:00
Bonian Chen
c9cca5940b [Settings] Re-enable previous work on data saver 
Previous work on data saver performance got disabled, this is a change to re-enable it.

Bug: 249502488
Test: build pass

Change-Id: I7264b1e8c21a789db358e0aae70a2cf0ce09ebba
(cherry picked from commit 2115d0e495)
 2023-02-24 06:27:18 +00:00
Bonian Chen
a721bf0895 Merge "[Settings] EID should be read out as phone number" into udc-dev am: 07d60877b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546836

Change-Id: Iadf05dfe61cf4949c3fdc98c9836841fd56ff67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 06:17:21 +00:00
tom hsu
22dff773fa Switch off Calendar UI fo regional preferences 
- Due to unsupported calendar type in java lib, it may happen
   unexpected exception. Hence switch off this function till we find a
   better way to improve.

Bug: b/270650444
Test: Manual test.
Change-Id: If380dbe5d98b915f3e288eb668df573ef2971ae2
 2023-02-24 14:03:45 +08:00
Charles Chen
4aaf6c191b [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours am: dce4259653 -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: Ie31e3ef8ec302bb85de93b937546141e5ea41b70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 03:24:08 +00:00
Weng Su
d7bbd4505c Refer to the last Hotspot password when generating the password 
- Query the last Hotspot password when security type is SECURITY_TYPE_OPEN and it will be used when the user changes to another security type

- If the last hotspot password is an empty string, then generate random password

Bug: 201789473
Test: manual test
atest -c WifiHotspotRepositoryTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPasswordPreferenceControllerTest

Change-Id: Id3a846099238433e7b6c8b934fa26a74df0dcb61
 2023-02-24 11:22:40 +08:00
TreeHugger Robot
802bff9092 Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev 2023-02-24 03:10:42 +00:00
Charles Chen
dce4259653 [automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247 -s ours 
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09 is already in history

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

Change-Id: Icdf326ddcf7fa2edc60f9e7b84c581d8a626e0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 02:44:21 +00:00
Anvesh Renikindi
52f50db889 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours am: bdd54472a8 -s ours am: 410fa6cfc5 -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

Change-Id: I7020d2db7917247f08344ccdee09b5799931f0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 23:33:36 +00:00
Anvesh Renikindi
91c11a510e [automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours am: 928a3c22a6 -s ours am: fc43a1156c -s ours am: 445d0468a7 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I4eff1cd9accd1cf73f5835d2b31ce7bf4a34958c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 23:33:33 +00:00
Jiaming Liu
e220a48650 [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours am: 8b4f036a3f -s ours am: be5caf1230 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I13481950639eef78839601e8171484036437fed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 23:33:30 +00:00
William Escande
1d6757782c Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4 am: 4df2d78817 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: Ia76738046150ec93c055479541944df25fa8673c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 22:53:11 +00:00
TreeHugger Robot
26a297b550 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d7b8a73da9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44e7027d1f79c77cd223b77facf5e2fa1f363021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:34:35 +00:00
Bill Yi
fc6f490526 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48957d9e2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4cbbb8c50c4c6304db2778e666e5c827efdce5dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:34:32 +00:00
TreeHugger Robot
bcba6207f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7d1dbd3e1e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib474ba7658438e6aa73bce78ad86bbfb7c03fde6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:34:29 +00:00
Bill Yi
6bb86d9a10 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1051b47c26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie721bc450b56f1b6cd8260a4640cbde2a5ac02e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:34:26 +00:00
TreeHugger Robot
9a3c028594 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2593eaea99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If320f4d7bec05195a695c3c862da656f756df935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:34:23 +00:00
Bill Yi
eb1157c0d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 899ab27b2f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd9697c51844e65517ebf743b126dd0a4cd26234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:33:18 +00:00
TreeHugger Robot
a8e2e5d101 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e -s ours am: 24c843fb30 -s ours am: 3648275e0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b47b85bcc95c48fa55a87447367de1a31e30440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:05:25 +00:00
Bill Yi
341f7a1185 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e -s ours am: 07b4ad75b4 -s ours am: 69803e4b8f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76910cf8e6a6d55de4878241c5f77eaf1833a956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:05:15 +00:00
TreeHugger Robot
14389d1638 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759 -s ours am: 95d0cc1766 -s ours am: 6ac3ac9e63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b65ec02b17b221fbe4bbf5220bddf6f451df853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:05:08 +00:00
Bill Yi
cddf29a7dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9 -s ours am: 881db50b16 -s ours am: 88743c60d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79d2effee11c8b9c514a6875dfb02133780830de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 21:04:38 +00:00
TreeHugger Robot
e32f2d2b85 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d -s ours am: cb5e97de8a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ae1a5d5238c34bfeaf30875122d41eaebb34398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:51:02 +00:00
Brian Lee
e07b26752f Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev am: 79effa02d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21526915

Change-Id: Id15ac19f3c27641f06b0f92bf572350d58adab21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:50:48 +00:00
TreeHugger Robot
7d260c1654 Merge changes from topic "tc_change_23022120_22" into udc-dev am: 97675e3475 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268

Change-Id: I8864a3d4ea5426644b4e61ac2e74c303e4a1e4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:50:26 +00:00
Bill Yi
0d1cc8a7f0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652 am: 5bdc27be54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I305c177e616a687460f04e559187b7e3055e4a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:49:49 +00:00
Henri Chataing
2b70be5485 [automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours am: fd0203ee28 -s ours 
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history

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

Change-Id: Idbdfd1f019919eecd92149aeecc29d1c7283f90a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:33:25 +00:00
Jack Yu
7f070778cb [automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 am: 252dd209b3 -s ours am: 8b0fa20c98 -s ours 
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8 is already in history

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

Change-Id: If060020d1bb33c11421b50a4ff1bdc7c008591e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:33:23 +00:00
Jack Yu
6aa379657d [automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b am: 86a6c6a9a7 -s ours am: 3c0d7c9bfb -s ours 
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e is already in history

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

Change-Id: I4efffbe58669c8546ba5ba316f8fc76455500606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:33:20 +00:00
Jack Yu
0800590570 [automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 am: 08c64a4414 -s ours am: bac3cfcbfe -s ours 
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5 is already in history

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

Change-Id: I06d2a597c142727de07804b53e5dbb75f3881ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 20:32:31 +00:00