Commit Graph

103027 Commits

Author SHA1 Message Date
Bill Yi
c5cbc6044c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours am: ec31d2697d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie622f99dae37f0c276aad327f14964f8f03b3d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:28:39 +00:00
Bill Yi
97f8879cff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours am: 9f888216b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1e5fe4b221792ee36b4512b421cd0a4d9c34f3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:28:32 +00:00
Bill Yi
ec31d2697d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibab132c360957a95e11a84dd1f7b88cc178a1381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:53:28 +00:00
Bill Yi
9f888216b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b27088d1c07bfaf369d2da9689e2c10eb3c4eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:53:21 +00:00
Bill Yi
a5ebf55708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours am: e7ce899b93 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I417725150925f81370959c4acea726122359c194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:26 +00:00
Bill Yi
1f00d35c4f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours am: c77e41302b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib32fc8b21ac7ff855eb41b010bca35b0077bcf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:20 +00:00
Bill Yi
365338b6d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I38710b182545fc2b88f8c8a195ae07548dabd06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:04 +00:00
Bill Yi
e7ce899b93 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2255dc24bfe7120b071b2d0eb276c7ed1eeef2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:01 +00:00
TreeHugger Robot
c1b2acfb3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e9f299fa94e9d69c778daaadc18ddacfbd51022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:31:00 +00:00
Bill Yi
c453a65ed2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f90f520b15abdb1fe0d6fb61158e6fdfec433a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:59 +00:00
Bill Yi
1df006f84c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib72b241a27bc95e319ab02bec34c4dd4857c79fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:58 +00:00
Bill Yi
c77e41302b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a3d96a7c13aadb307de14e0702ebe0b1896e3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:55 +00:00
Bill Yi
94a1ab304a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours am: 44f1eb9246 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a217f11889d90a9a51c519432d00899ef45a33e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:30:18 +00:00
Bill Yi
0b07e79cc1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id91cf446e28fb0ced0561e2be10ced8c69ab6427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:06:03 +00:00
Bill Yi
7a2a5bd916 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3933eb376b11ac6d0944db6ada4c75b52ff87674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:58 +00:00
TreeHugger Robot
2a21fa1024 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5113f388898f79c43b714ec80cd73b19e75814a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:01 +00:00
Bill Yi
1a4297414e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1806d21043651eccf7da31df5bc4268782bb3d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:05:00 +00:00
Bill Yi
52bb0b7039 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iec9abc61990ce43e48934499ce7847a18f01a82f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:58 +00:00
Bill Yi
4c08f33493 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3fdf81ecb5a85ea1a482ff4cfc649c4e0351114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:53 +00:00
Bill Yi
44f1eb9246 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7a15d3be281479c7e29f34a2862ca9e1c0dd15e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:04:48 +00:00
TreeHugger Robot
6c9433b31e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1109dc7c1fa291d2a19dc0b14b8facfa01a6d411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:33 +00:00
Bill Yi
e0da5747da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5099a137fe14d98967f9d055bfcd4c41d8d4f05a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:27 +00:00
Bill Yi
53993399da [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d10981a2dc1b03f85c26814667640167620a5b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:19 +00:00
Bill Yi
a509cd4695 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I014dc4924b12540a4eb6c97d93fd0b4d67155879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:26:44 +00:00
Bill Yi
f46213941c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idccc655c084ed720a595d4a8946738fa9eecb39b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:26:27 +00:00
Bill Yi
223d9c81f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee353b944bfcf19af8b5333daa0dfcfcbaa85cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:26:16 +00:00
Lucas Silva
b0bd5b21e3 Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768

Change-Id: Ibd114267c5254a0eb6484c92bfb6015ddc67f69a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 14:44:19 +00:00
Lucas Silva
dc44eb1feb Merge "Update dream settings logic to keep the customize button unselected." into tm-dev 2022-05-02 14:19:22 +00:00
Joshua Mccloskey
43e07e7ca8 Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18083583

Change-Id: Ia590645b5af889590931a4c07757f3769f37dbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:29:06 +00:00
Bonian Chen
3444d7a8c2 Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069

Change-Id: I5ecf6c2a9e1d5c5c9118b1d50da028119d30106c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:27:47 +00:00
Bonian Chen
fd374c4dc7 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: I60bd5ed335c7ab097b14e34cb297525c106add90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:27:38 +00:00
TreeHugger Robot
c272070439 Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823

Change-Id: I03c10e5bdf431f88b614838c61da069bb2a46549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:27:30 +00:00
Jan Tomljanovic
7393c50941 Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249

Change-Id: I5f279653ed40cab572987459964177ec5f8fe09d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:27:22 +00:00
TreeHugger Robot
069afc805b Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822

Change-Id: Idb48698e431b4272ddc8f903dc71008985a80b86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:27:13 +00:00
TreeHugger Robot
8f53b0691d Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885

Change-Id: Idc2440f3dcab5006089a268b046d923a4c2be566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:27:04 +00:00
Chaohui Wang
c39fe57d8c Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070

Change-Id: Id00a5e8d2342d20bc071e3128d6a140f48ef2c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:26:56 +00:00
Tom Hsu
4c85dde8b3 Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882

Change-Id: I042005a4ca30b0f660ad053d84e2b977e2b2a628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:26:48 +00:00
Arc Wang
1398e58cbf Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167

Change-Id: Ie9d9ed73dbd4eafdbfb77957d8ceb27e37e52640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:25:54 +00:00
Joshua Mccloskey
8f463f5c88 Merge "Fix final UDFPS enrollment haptic." into tm-dev 2022-04-29 22:59:19 +00:00
Joshua McCloskey
b7f3001cea Fix final UDFPS enrollment haptic.
Test: Verified both accessibility/non-accessibility flows
have correct haptic feedback.
Fixes: 229804277

Change-Id: I8623771016b9819d4211d07a19b50291a8b06cd9
Merged-In: I8623771016b9819d4211d07a19b50291a8b06cd9
2022-04-29 22:52:44 +00:00
Lucas Silva
e2ef52d6f1 Update dream settings logic to keep the customize button unselected.
Test: manually on device
Bug: 227717835
Fixed: 227717835
Change-Id: I4d796c3b7510baf07a670347fe4112a0b95d3036
2022-04-29 20:43:20 +00:00
Julia Reynolds
58f0b1d55d Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961

Change-Id: I589aa8107d165479d380a23b18a4fbe74bdc5a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:51:50 +00:00
TreeHugger Robot
fbffb07088 Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824

Change-Id: Ic0fb3fbcf3229c65ceb99fcfbceaeb3a2665b94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:51:20 +00:00
Calvin Pan
215b87861a Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006

Change-Id: Ib73ac117460a8229b9904c414b1a9cd99c6d0651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:51:11 +00:00
Betty Chang
4779a03d38 Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166

Change-Id: I7a0697dc1f8cc801d702cf33c385097c42816e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:50:08 +00:00
TreeHugger Robot
05eb3510d4 Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584

Change-Id: I67831e6261c7722db40d6e24915f42495287b61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:49:36 +00:00
YK Hung
8cda726e7f Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883

Change-Id: I6a5042db0114e9d2da8748fb6a30a8f6aafae6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:49:27 +00:00
Bill Yi
de605396bf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 am: fa29c0c3bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iabd5e1550f5d74ebcf69a39d82f8db2d8a2a4c69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:49:17 +00:00
Bonian Chen
5ef52de6b2 Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev 2022-04-29 16:00:31 +00:00
Bonian Chen
7bdf717410 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev 2022-04-29 15:59:32 +00:00