PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,966 Commits 1 Branch 0 Tags
b24d773173f24e8d28fe34c1c94d2366ea490a9c
Commit Graph

126966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
b24d773173 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: a785e266a1 am: b35a1eb5ca am: eb6317f2c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ieebfd2c7eb33cd57387680a131102b9e46cb5ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:54:53 +00:00
Bill Yi
5e480c92ab [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: e35c4affd7 -s ours am: 3752af781d -s ours am: 4183cb07f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib29947eec9ce2bdd16852040dde29253332a990d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:54:46 +00:00
Treehugger Robot
fc57d08ead Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b am: 9bd80164e2 am: 68b0a1a765 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ie585fdde2db0d01539e19f56ba5109257e46a1dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:51:12 +00:00
Treehugger Robot
eb6317f2c6 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: a785e266a1 am: b35a1eb5ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I352007078a49c609314bb2dd0ef96f0636ca9d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:45:59 +00:00
Bill Yi
4183cb07f4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: e35c4affd7 -s ours am: 3752af781d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5dcbce2d2dd5f8681cc20536f25185fb8eae7903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:45:52 +00:00
Treehugger Robot
68b0a1a765 Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b am: 9bd80164e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I306e19d3503d7c5af19ac7abb845e805c91f24da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:41:39 +00:00
Treehugger Robot
d84734bcfc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: 755bff2524 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf40d48b42ee8a6fbe8cfcbff6a70dfe552302aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:38:28 +00:00
Treehugger Robot
ad5ee4e9b7 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 3dd5923ee6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ic53a5e1fe9714613b533a1926cdb7cba22563e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:17:40 +00:00
Bill Yi
af8b70b2bc [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: fdb5379a3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c4d74d327462a3a16601ee45ed1b2506a216d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:17:34 +00:00
Treehugger Robot
297fd154a2 Merge "Fix string" into udc-dev am: 81ac516705 am: 6dd1415360 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ia5b0a4d82084445bc93f952358df36e98147235e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:17:15 +00:00
Treehugger Robot
b35a1eb5ca Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: a785e266a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I58a383470f24e255d6532ec90373ead93f916fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:49 +00:00
Treehugger Robot
755bff2524 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f3db47edd99a6e7a05a5b3daccd9d7062b9ab4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:44 +00:00
Bill Yi
3752af781d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: e35c4affd7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I309448f407730296c956ef3ff9bc45611f383307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:43 +00:00
Treehugger Robot
9bd80164e2 Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I722191069fb3273957f569354179ace9311e805f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:25 +00:00
Hao Dong
2f5564f960 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 0ff2d2b2af -s ours am: f99b22505b -s ours am: 09362ab430 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: Ie2b16d9aad7513a1ea002eb09ce65bb4488684ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:22 +00:00
Treehugger Robot
3dd5923ee6 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I900808f14cb432a54401379725ac7f29cb9c344a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:02:31 +00:00
Bill Yi
fdb5379a3e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65abe33b0e180253fc49c79ab457aedb8f659c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:02:23 +00:00
Hao Dong
5e660a090d [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 am: 4762df7e21 -s ours am: 4172ed9816 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: I9eb0f8442214a531053c4ac1766a8ad41d997e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:01:34 +00:00
Hao Dong
8c175f0fd4 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 am: 3d52ce0a95 am: 119012dd06 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: I4d33492a89c16854dc3448a9b7d77fc30b332167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:59:29 +00:00
Treehugger Robot
6dd1415360 Merge "Fix string" into udc-dev am: 81ac516705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I0920365fe3dd0e9ee7958ac82fbeb6f8359c6f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:58:53 +00:00
Treehugger Robot
e7d695f07a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8b6175859af028f1341d807fa08567b5dfae1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:56:48 +00:00
Treehugger Robot
a785e266a1 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ibfde1d3da58ef0a954dc39502d8c6258f5150795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:54:46 +00:00
Bill Yi
e35c4affd7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44eb539eef07d75771be0e10c871e64a2323fe13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:54:39 +00:00
Treehugger Robot
44c807906b Merge "Fix string" into udc-dev am: 81ac516705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I46eb103dc599e26b08d460e49c8fd673a4c1e749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:54:12 +00:00
Treehugger Robot
a5af82be11 Merge changes from topic "tc_change_2305100725_23" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-11 19:28:21 +00:00
Treehugger Robot
b570c10767 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-11 19:28:21 +00:00
Treehugger Robot
81ac516705 Merge "Fix string" into udc-dev 2023-05-11 19:21:54 +00:00
Hao Dong
09362ab430 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 0ff2d2b2af -s ours am: f99b22505b -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: Ia23d8f6fdf72bb36ae0bfd52fde36d0b4be36146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:12:39 +00:00
Hao Dong
4172ed9816 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 am: 4762df7e21 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: I0cdef07f3901b531f78f50a4a25bd3fc55e5535d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:08:09 +00:00
Hao Dong
119012dd06 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 am: 3d52ce0a95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I6825102c105e5e0c9a7302c9b696d44a885ad120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:03:44 +00:00
Hao Dong
f99b22505b [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 0ff2d2b2af -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: I43bfbe506a4a65e3867c865ad028b6c8c8a3c97b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:42:18 +00:00
Hao Dong
4762df7e21 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I8f0423bba882ed4d2ba3c84fb99dbb38aef0683f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:41:24 +00:00
Hao Dong
f4cb747372 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: a17d706d89 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 968c5fb6f0 is already in history

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

Change-Id: I4685547d1294607e4ffe0bd0cd078dc80d50ac94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:39:06 +00:00
Hao Dong
3d52ce0a95 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I6436874a454da9870a6e872e67334a5432c77635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:39:04 +00:00
Hao Dong
51554eb9a1 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I0fe97397b725927263ef4bf4e550199911c64217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:57:59 +00:00
Hao Dong
a17d706d89 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: Iedba9fd97c7657ac860276f7a0a19e0a89c4541b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:56:56 +00:00
Hao Dong
0ff2d2b2af Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: Iaaab846636e37e82b01d0a11881083be760a482a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:54:13 +00:00
Becca Hughes
f7c4d9c903 Fix string 
Test: make
Bug: 281047738
Change-Id: I7f65749cbdee95ab9447dc0b055d66fd962547dc
 2023-05-11 17:45:30 +00:00
Hao Dong
c753221adf Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev 2023-05-11 17:17:06 +00:00
Treehugger Robot
5fc321c413 Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb am: 90456a7140 am: 842e51e19d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: Ie0120c0e32be0a39b131e0d6bd6409af9c95061c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:00:26 +00:00
Treehugger Robot
2e1e70037b Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd am: 65ef6d0f2f am: ff7d516eec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: Ibf1377932e3f12097ad524d91ad83a086c2a253b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:00:18 +00:00
TreeHugger Robot
a2a4337891 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 am: 2f0c6e89a4 am: e45f5fff74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I1a090e19124dbbed5dd7c37296a180c10a152452
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:00:10 +00:00
Treehugger Robot
13c33b4a74 Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: e2ff838b0c am: 06661db1fa am: 98d872d0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: Ibe080f921e3ccbeb7c2154e624f4436124764444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:00:00 +00:00
Treehugger Robot
a2898730ae Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 1fa9e9fac5 am: 02237bf13d am: 46d938dec9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I941baadd9fe48fef0ad3c3137f0fc3a6c7200f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:59:51 +00:00
TreeHugger Robot
fbae65eadf Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: c639d6fd91 am: f178365e07 am: fe62fa5583 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Ib34345dba25e5382b51a0fe804cd6388d0221cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:55:18 +00:00
Treehugger Robot
2d20a1dc38 Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb am: 3a788f845e am: 89ac7e108d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I0dc4bceccd15a4fd84085dc499630cdab2425790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:54:40 +00:00
Treehugger Robot
d4b0197c44 Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd am: ce0a356845 am: 8b32e6f12f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I3502b0c415c03a760cba0a4a0fe25b79b025de0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:54:14 +00:00
TreeHugger Robot
66c61a3335 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 am: c4ee326ee9 am: 72269bf6d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Ie9d10a396df739950bfaf118e4ae5345f51a2ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:53:14 +00:00
Treehugger Robot
842e51e19d Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb am: 90456a7140 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I1bef49554c966ec58026eacea7654023c03f75a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:12:21 +00:00
Treehugger Robot
ff7d516eec Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd am: 65ef6d0f2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I875b53a2d8fb092c5a1b8bf86f36ce1daf0bda95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:12:13 +00:00