TreeHugger Robot
268af9cc53
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
am: e6998973d2
am: cbe5c8f504
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: I1e357fa6557e71e39a05177848541a5a492e2d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:26:04 +00:00
Chaohui Wang
4edb135481
Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
am: 9a96e14cc2
am: e2869f34fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797
Change-Id: Ia5ec69909da46d3dbec74dc80459d43f5306f768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:25:56 +00:00
Vincent Wang
c2579ea39d
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
am: ef5aa5d985
am: 3227aed5dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: I0b6be18e8b112baebd2b8d4ebb62282a0ae99455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:25:39 +00:00
Chaohui Wang
490bffa06d
Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
am: 322234a222
am: e6866d70ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917
Change-Id: I1af006294b0fef7cc33889e14d1df583b3e7d953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:25:29 +00:00
Treehugger Robot
fac860539e
Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
am: 0cbdd648f5
am: fe33d447f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218
Change-Id: Ia78fea3f2ba241fc2582bed751438eab07561e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:25:23 +00:00
TreeHugger Robot
89616fea14
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
am: 1918f46ed1
am: beae23eca8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: I16a759208298683cbcf6b45c942d0a2a21f21f16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:25:13 +00:00
Weng Su
c6503d79bb
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
am: bfc8efc4de
am: af32065193
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: Ia78c06d8881860e877610d62c433224511674a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:24:43 +00:00
Chaohui Wang
3c82ea6446
Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
am: 5e5e46833e
am: 45a5b6ec69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797
Change-Id: Iab3613c6c3c2aaa02f77165412b36e16f1cbd31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:24:15 +00:00
Treehugger Robot
9a44b0402c
Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
am: bea756aa7e
am: cbcc16ddcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218
Change-Id: Ibeec2f373fd1a32dea549a973ec6bd773f933e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:22:02 +00:00
Weng Su
7b604ec792
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
am: aed54a1296
am: b6a52e9c74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: I0d3b241b554674f88bcd62facd4ca29f7d545b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:19:42 +00:00
danielwbhuang
c92bd9789d
[Fixed] UI issues after rotation
...
1. Use onSaveInstanceState to store the data.
2. Do not repeat to automatically select the keyboard layout.
Bug: 281481973
Bug: 281461013
Test: manual
Change-Id: Ieaa8fa3d2e6c22c39b34313d255e4f7869777a8b
2023-05-09 20:03:17 +08:00
Guangjie (Jerry) Shi
3b5524c869
Merge "Fix work profile issue" into udc-dev am: ece191b09f
am: deff8cb5a9
am: 519ff26f75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871
Change-Id: I78ea2ee9304e910548c725461f2198c62f207f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:03:14 +00:00
Vincent Wang
2e8cba3e95
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
am: 1e8948fbcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: I3cfeb0c4e8117e4aca83e3a0da18050210d29236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:33:29 +00:00
Chaohui Wang
39c6a23f92
Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
am: b52b6f6d46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917
Change-Id: I133e238da705871a308265ba66ea39e28b7e559f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:33:08 +00:00
Derek Jedral
1238ef9c0a
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
am: 2696c8dbc7
am: 98d9c60736
am: f280014274
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: If06da8e7d0aaaf139108e4c124dd3594004204aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:49 +00:00
TreeHugger Robot
cbe5c8f504
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
am: e6998973d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: I739c4c8bfe467ab16c293ddd9c738e669ea15d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:48 +00:00
Vincent Wang
65856e78af
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
am: 1e8948fbcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: Icd20c76b813ec38cc7abe99098c6e59238de47ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:43 +00:00
Chaohui Wang
5a98395f99
Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
am: b52b6f6d46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917
Change-Id: I9ee96ec89a577964a3aa4f412e4e9db21d8423f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:35 +00:00
TreeHugger Robot
8b404ed53c
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
am: e6998973d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: Ie048814c0ee63e397923e79c3fd62e0119c08c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:27 +00:00
Chaohui Wang
e2869f34fa
Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
am: 9a96e14cc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797
Change-Id: I0084db67d3524ae8d7a3309b6c015b8ddd286bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:26 +00:00
Jack He
1327625fdf
Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795
am: ceb3ec60ee
am: 9e85773279
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696
Change-Id: I81fe3e3472a5596ed310255f1abfbb90df4289e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:24 +00:00
Chaohui Wang
fa0fbd1b4f
Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
am: 9a96e14cc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797
Change-Id: Ic894ac52d1ae00cb786d528867833b63f9759779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:20 +00:00
Treehugger Robot
fe33d447f9
Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
am: 0cbdd648f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218
Change-Id: I21debfcb2a88abb3c53f5af84627cfe8694fb37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:31:59 +00:00
Treehugger Robot
fb54ae29f4
Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
am: 0cbdd648f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218
Change-Id: Ic71728452f62ca7ab8c4ebd1b63a74c9219dee16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:31:51 +00:00
Weng Su
1270d5ed43
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
am: bfc8efc4de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: I8f5239ce9fe220ba2b3caff55cfe818a999afaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:31:14 +00:00
Weng Su
af32065193
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
am: bfc8efc4de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: I6e90cce1fb6ae6907b0bd63c0e2d1421608a3f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:31:02 +00:00
Vincent Wang
1e8948fbcb
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: I68350a070fd57a6358b099bd303fb37ac84bf6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:25:12 +00:00
Chaohui Wang
b52b6f6d46
Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917
Change-Id: Ifff45d0c5fb5a65681c2ad60de6d854a5dd36c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:25:01 +00:00
TreeHugger Robot
e6998973d2
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: Ie234dab67301b120466fd4b3f8b32413a320f876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:24:31 +00:00
Chaohui Wang
9a96e14cc2
Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797
Change-Id: I3fdb00cad883651e6135161c843cb119932fbb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:24:22 +00:00
Treehugger Robot
0cbdd648f5
Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218
Change-Id: I7441e0e8b6ecd9aa86eb6aad936c04e7d79d4dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:15:35 +00:00
Vincent Wang
7f21ad81f7
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
am: 81740a7c0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: I08589651a8ba8924419b17cba205c0cc3408f6c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:14:14 +00:00
Chaohui Wang
704b8c2dc8
Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
am: 5d8cbe5b2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917
Change-Id: I489c1ca7265de61419e06bf3923381105287a61c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:13:04 +00:00
Automerger Merge Worker
4cca88b1cc
Merge "Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a" into udc-mainline-prod am: 7374006284
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: I3204902a369947755839ccd92cbea6387f19755e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:12:30 +00:00
TreeHugger Robot
fa0e390fbe
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
am: 914ed31fe3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: Ice2f958de203a738a534155e41694a68870e4649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:12:00 +00:00
Chaohui Wang
53726b4875
Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
am: c688e7b316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797
Change-Id: Icdbbbd77587a4c502bd05e3c65f2f42b22748480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:11:32 +00:00
Treehugger Robot
36706f4b22
Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
am: cb94f83fee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218
Change-Id: I3c6a5a38e522380cbf8c700f7f8e160c61d4f830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:10:44 +00:00
Weng Su
8ea7e0d650
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
am: 0a4538dd97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: Ic7bbfc071f0ef22a0c93a972f9b2d51cc45fc41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:10:31 +00:00
Automerger Merge Worker
cc3498cfa4
Merge "Merge "Fix work profile issue" into udc-dev am: ece191b09f
am: 1855ff060c"
2023-05-09 11:10:15 +00:00
Guangjie (Jerry) Shi
725d3ae647
Merge "Fix work profile issue" into udc-dev am: ece191b09f
am: 1855ff060c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871
Change-Id: I324c9c494d23e34423204589993f67a71e97cc95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:10:10 +00:00
Becca Hughes
96199fa144
Merge "Disable all providers if none selected" into udc-dev am: 762691c365
am: 9230389dcd
am: 72ff60a0e4
am: bbe02d73a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870
Change-Id: I9b831577ed32eb5f74715fcf399db5070fbf890d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:10:07 +00:00
Austin Delgado
6108b287d7
Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923
am: 083f9699c5
am: 8c8cf133be
am: da2701092f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: I517d6b8532262ad177307dc697a5c5273b360880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:58:02 +00:00
Vincent Wang
3227aed5dc
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
am: ef5aa5d985
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: I2e1da6322f2b67d05543bae011b47a157e725bbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:52:44 +00:00
Chaohui Wang
e6866d70ca
Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
am: 322234a222
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917
Change-Id: Iaba632bea2446f9f28f88d7e11d0851a53ada043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:52:23 +00:00
TreeHugger Robot
beae23eca8
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
am: 1918f46ed1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: I616ed702530db4a25fb65c39d88206ebfeb50d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:51:52 +00:00
Chaohui Wang
45a5b6ec69
Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
am: 5e5e46833e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797
Change-Id: Ieeaa700a8009abf599189701119fab4848a46697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:51:45 +00:00
Treehugger Robot
cbcc16ddcd
Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
am: bea756aa7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218
Change-Id: I48c84c02a145c206ebc4ccc0e842582aaa092bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:51:36 +00:00
Weng Su
b6a52e9c74
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
am: aed54a1296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: I14e04149f68092c36944d38120666bef355b1f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:51:18 +00:00
Weng Su
bfc8efc4de
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: Ic6ebc234fb721cc0f2b0cf28bfdd029755aba943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:50:45 +00:00
Vincent Wang
ef5aa5d985
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: Icc90f4d9c3bc8b5094152af16c61398e83cae448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:50:27 +00:00