Ricky Wai
f3ed6ffb04
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
am: 8f61acd8c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240
Change-Id: I63d21313f123db06ce3c70e8e2bfb8429f3e531e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 15:45:10 +00:00
Ricky Wai
1a574d518b
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
am: e2edfe3235
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240
Change-Id: I71ce8388f0b3bba551896b8869e445f095b53eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 15:19:35 +00:00
Ricky Wai
8f61acd8c2
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240
Change-Id: I8342a30b9e86699fcce7f8f5858572def92c30ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 15:18:58 +00:00
Ricky Wai
e2edfe3235
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240
Change-Id: Ic4f104b59e2fceb3e8d949bb8c6402abd51c2a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 15:17:55 +00:00
Ricky Wai
fd7153ed39
Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev
2022-04-22 14:53:00 +00:00
SongFerngWang
b76feffe4f
Gray out the network mode UI before the carrier config is ready
...
Bug: 202167671
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ib502ac19ea2c19dae95025302dd82aa2b1c7ff88
2022-04-22 19:28:13 +08:00
Bonian Chen
aeac0619df
[Settings] Code refactor for combining TelephonyCallback with Lifecycle
...
This is a helper class which may support monitoring the
TelephonyCallback under the condition of Lifecycle state STARTED or
RESUMED.
Bug: 229689535
Test: unit test
Change-Id: I6d26bee604d9559e207e107b2f26583f700f8e0a
(cherry picked from commit 7c5259efad
)
2022-04-22 10:39:04 +00:00
Automerger Merge Worker
aa2ed50e34
Merge changes from topic "am-0af370f6b33542b09d673716bbc90c20" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours am: 7d5cc42c81
-s ours am: 5c7d0155a8
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours am: f1b797ac9b
-s ours am: e74c40fc84
-s ours
2022-04-22 08:30:32 +00:00
TreeHugger Robot
69acf57ed4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours am: 7d5cc42c81
-s ours am: 5c7d0155a8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Ie819eb7ee6d278600746aa2abf460c719dca40fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:29:31 +00:00
Bill Yi
f319170f36
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours am: f1b797ac9b
-s ours am: e74c40fc84
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Ib856ed06b9c04dcde4046f203421e9dad8004561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:29:12 +00:00
TreeHugger Robot
45f2cc4a18
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours am: 7d5cc42c81
-s ours am: 46f1b16545
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I9debab53eab77d49cfad8fbc16478a641a5baa5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:28:43 +00:00
Bill Yi
8e7b0e6168
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours am: f1b797ac9b
-s ours am: 2affff9747
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I3972d0ebabf19df58ae5abc285e03d081f78e2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:28:26 +00:00
Bill Yi
2fbc122a96
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372
-s ours am: 896ea5769a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: I372cea0699af4aba561966f122f4c30b3cb1cbde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:22:05 +00:00
Bill Yi
c55eab5de8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3
-s ours am: de73de0c47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: Ibbd3890ea2856cf551ca35806385ec3e61339c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:21:38 +00:00
Bill Yi
8a9c502802
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1
-s ours am: 9ea6d0e609
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: Ie39ff0e257acab9d06fb32f8f4e296728e7d768d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:21:16 +00:00
Bill Yi
4061677234
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f
-s ours am: 8c88568430
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I7645079f4dcb9d80f320713d12e672dc619f4721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:20:55 +00:00
TreeHugger Robot
ac7f4cf8c5
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
am: 21a233b016
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: Idbee1f13bcc52dfdbc664ed25e411ae79f6df8bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:20:06 +00:00
TreeHugger Robot
5c7d0155a8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours am: 7d5cc42c81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Ie68d6b19f8c300ed29b40d45f4e50cf92718a5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:19:41 +00:00
Bill Yi
e74c40fc84
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours am: f1b797ac9b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I4826b58bb2c00972c0ed25f0db452c6fd37914d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:19:22 +00:00
Bill Yi
297c6c02a8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372
-s ours am: 430feee676
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: I7c829039a1ef8ef60d645905d1e878b91b00fb9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:05:25 +00:00
Bill Yi
f9cd80a484
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3
-s ours am: a4dc078791
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: Ic47f946233130e410cab93845956c298a2c615a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:04:57 +00:00
Bill Yi
e6e9f5cf87
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1
-s ours am: 304ef2074f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I774e118ec5f55034787c12c1a6eb95d4a7dc7613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:04:39 +00:00
Bill Yi
a1be6fe405
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f
-s ours am: 4a4c5fd413
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I6607b2cb58c573607fc214e8c2c3defd79aa5c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:04:23 +00:00
TreeHugger Robot
56c72e3ede
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
am: fb74f218a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: Idd9710b2a3c346e2da1d024d526fc422e8d14d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:01:44 +00:00
TreeHugger Robot
46f1b16545
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours am: 7d5cc42c81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I21c5b9f71dcba7f7eb9a394b8f9bd7fad1aa920d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:00:57 +00:00
Bill Yi
2affff9747
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours am: f1b797ac9b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Icd45906eb216359a6235529f1ac58ca594d8384a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 08:00:41 +00:00
Bill Yi
896ea5769a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: I89a39ec5b73a75bcac87834ec4aff57b4f44b557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:54:21 +00:00
Bill Yi
de73de0c47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: Ia981adacd8291bf34a0cdd7efe50efe4dc19798a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:53:54 +00:00
Bill Yi
9ea6d0e609
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I5464636ed72692b8443643142e9fe58e45221888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:53:34 +00:00
Bill Yi
8c88568430
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I4edc606820da1429054292718c70341fc122cb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:53:18 +00:00
TreeHugger Robot
7d5cc42c81
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: Id2024b4c9ab3d5bc9efd2985847f0396112ef464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:52:28 +00:00
Bill Yi
f1b797ac9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024
Change-Id: I1d0c3fd484331c7cd7e1d55106fd1c89c67da57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:52:01 +00:00
TreeHugger Robot
21a233b016
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: I9ce1f767afec1b5d10e0e4520fd3cc1a4d936ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 07:51:06 +00:00
Bill Yi
430feee676
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: I62ec2e91e1d51fb3c9a3a5e636e78b8cb52fc65f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:20:57 +00:00
Bill Yi
a4dc078791
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663
Change-Id: I8b55d3a10035d8cb4ce739b8f50eb528c65ab07d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:20:34 +00:00
Bill Yi
304ef2074f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: Iea16fb21d7e78772acedc67c4e708b89edbf6035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:20:11 +00:00
Bill Yi
4a4c5fd413
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668
Change-Id: I8c0972874eee8d0018a39d9c477a40806eed9f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:19:50 +00:00
Bill Yi
bfd3ced372
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-22 06:17:37 +00:00
Bill Yi
3ec36ec5c1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-22 06:17:37 +00:00
TreeHugger Robot
fb74f218a9
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346
Change-Id: Ia682eb788f6ecc8c7f7f9b1533f1e78d0b8c93b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 06:08:49 +00:00
TreeHugger Robot
49cc66afd3
Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev
2022-04-22 05:50:05 +00:00
Mill Chen
5d33ca9120
Remove loading spinner from Premium SMS access
...
The loading spinner in the page is displayed by default, regardless of
whether or not how many apps are in the page. This change is trying to
remove the loading spinner from the page since this page doesn't have
many apps in it.
Bug: 222441974
Test: visual verify
Change-Id: I9b2b031122e6b6d521466ccf53e39185cfcab687
2022-04-22 13:41:45 +08:00
TreeHugger Robot
226baf6f25
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-22 03:59:00 +00:00
Chaohui Wang
921f561964
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
am: 1dd8117b21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: I18c6371fbce27bf756f7b909f824bc50ab35b8db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:11:49 +00:00
Stanley Wang
8d3cf3efba
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
am: 1f2337d627
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: I231576223d8b68923b2234bd6c73edfdd22c02a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:11:43 +00:00
Chaohui Wang
148b586d1a
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
am: 956f0a8cc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: I0debef41eb3f5da06f7c875ed4d787dd3b013557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:11:39 +00:00
Stanley Wang
c57825f409
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
am: 18206def81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: I63e119964d7b9b99c7bb1d4d0bafc4cf13745390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 03:11:32 +00:00
Chaohui Wang
956f0a8cc2
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: I36dbc24d358252cbc935eec76e23287e774823dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:35:55 +00:00
Stanley Wang
18206def81
Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356
Change-Id: Ia0b0ec3b7a772d241112cc7f45d42a677de4a827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:35:46 +00:00
Chaohui Wang
1dd8117b21
Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758
Change-Id: Ib5d994aa207584d817e4a06036727edb1113d47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-22 02:34:27 +00:00