Jason Parks
9afd03c09e
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: 3b6fe0813b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I41aea305788fc9063b50676b5594bfdd8f8873ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:42:13 +00:00
Jason Parks
296fe0d0cd
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: a48c508afa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I9bffe0d61056d7575015f5b20ff4b71da9714f09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:42:03 +00:00
Jason Parks
3f55cd8929
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
am: 3b6fe0813b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I0fafd91b14712a6bf9a118a2512973af1fb3d502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:42:02 +00:00
Jason Parks
3b6fe0813b
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I14d08a02a7b27ae4bf3e54c03f9c9d33c6104a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:14:53 +00:00
Jason Parks
a48c508afa
Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I7d5be03e04e9c500bfdaef61dfef5699288dbd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 13:13:24 +00:00
Jason Parks
73276b3c91
Merge "Use API to check for the superivion component." into tm-dev
2022-06-15 12:54:00 +00:00
Bruno Kremp
b16ac39ee1
Keep setting of "TurnOff hotspot automatically" when AP is changed
...
When AP config is changed, setting of "TurnOff hotspot automatically"
will be reset to default. Hence keep the setting when AP config changed.
Keep setting of whether auto shut down is enabled when AP
config changed.
Co-authored-by: Fangxiao Cao <fangxiao.x.cao@sony.com >
Test: manual test
Bug: 235370570
Change-Id: Ibd3d59b6a86edaf1253a2c9b035576e60a7beb96
2022-06-15 09:20:18 +02:00
TreeHugger Robot
8f33d7a795
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours am: d61b92219c
-s ours am: cb303ebddb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I5ff8d0c73c4715f7807db64e8e8d75a7b9a3c41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 07:06:35 +00:00
Bill Yi
5a1720b53b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours am: 46611a953c
-s ours am: b96acd4fac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I2e8b446607dd7a54d049e1522eb01a41e0dd7ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 07:06:22 +00:00
TreeHugger Robot
cb303ebddb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours am: d61b92219c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I08978da87652acc89b46407184d3953c56cb4116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:40:04 +00:00
Bill Yi
b96acd4fac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours am: 46611a953c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I57af273bd94d9d2b70d352bcb9755b1d1bcc86f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:39:45 +00:00
Automerger Merge Worker
3d7561c4ab
Merge changes from topic "am-1da92e41bda443aeaea2b6534a421baf" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours am: 5e4e0ee275
-s ours am: a1a8b5e856
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours am: 588d339d4d
-s ours am: a7456fac34
-s ours
2022-06-15 06:31:01 +00:00
TreeHugger Robot
26cca4b0f0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours am: 5e4e0ee275
-s ours am: a1a8b5e856
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I31a39c9e4f8bc895da93426237576075c9c2ac2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:29:46 +00:00
Bill Yi
d5086bc572
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours am: 588d339d4d
-s ours am: a7456fac34
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I745e0fb34e426e8f61baee2335094d7e3392e0cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:29:37 +00:00
TreeHugger Robot
2069ea61f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours am: 5e4e0ee275
-s ours am: 529d67575d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I7b2bdbf34eaf15c7777567d5f37caf234f1f04ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:28:55 +00:00
Bill Yi
c621b3bec4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours am: 588d339d4d
-s ours am: 09a7a53b04
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: Ie2421b372d94b2cdfa9f7b1588e82f8e21ab53dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:28:44 +00:00
Amy Hsu
d6167384c2
Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095
am: 16d022942f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014
Change-Id: I980075fcc6d48e61d4661a5d3922b11d98e69768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:28:23 +00:00
Amy Hsu
d68c5cd23b
Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095
am: 7e0b5c8c07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014
Change-Id: Id864846262cc794add2694833e6618d770409dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:21:36 +00:00
TreeHugger Robot
a1a8b5e856
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours am: 5e4e0ee275
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I64150ce37ea4f962599a36f3934939905c44f2cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:21:31 +00:00
TreeHugger Robot
529d67575d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours am: 5e4e0ee275
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: If296374235c6a3bfd6c73d2aa17467bea2608aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:21:25 +00:00
Bill Yi
a7456fac34
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours am: 588d339d4d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: Ic8d0011e7ee64d4511fa8998a3bd2181783ded91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:21:22 +00:00
Bill Yi
09a7a53b04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours am: 588d339d4d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I6d6fe6513e6bf4091223d688f65348eddf70fdab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:21:11 +00:00
TreeHugger Robot
d61b92219c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I23832d4722bd717e48189823e8557ba268ec797b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:16:59 +00:00
Bill Yi
46611a953c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: Ie5d75ff189ee4beac391c7978d4a313868e9aa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:16:42 +00:00
TreeHugger Robot
5e4e0ee275
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: Ie4e1f5d253455ff3aea0a1b7878d2d79f43b1b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:16:33 +00:00
Bill Yi
588d339d4d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880
Change-Id: I4f573d48d312206e50d030707f37a2a3953e9332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:16:20 +00:00
Amy Hsu
16d022942f
Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014
Change-Id: I399f7592e930545ba1d9e38a62d58aa58bda5b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:11:34 +00:00
Amy Hsu
7e0b5c8c07
Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014
Change-Id: Ie88b0db9abc05339c9c77aa87350bcd3acf963e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:11:31 +00:00
Amy Hsu
be6fef3095
Merge "Restore the density when it has been overridden" into tm-d1-dev
2022-06-15 05:31:43 +00:00
TreeHugger Robot
50a74572fc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-15 05:25:34 +00:00
Bill Yi
2609fb2ccb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib54c2f3b145ff0c53809022e7baf4083d5ba1ca8
2022-06-14 21:21:00 -07:00
TreeHugger Robot
7eed66e60f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b
-s ours am: 2fc7ce6a84
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18878451
Change-Id: I4377de7bdd8de4a2532807b90f8bdbe1a49e8107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:42:21 +00:00
Bill Yi
11de0c2aea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7
-s ours am: b70ab5079e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18878451
Change-Id: I5d5286c23d1e35a4a87c5014d3b2c26e8072077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:42:00 +00:00
TreeHugger Robot
f8a6212443
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b
-s ours am: eb1d552ac2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18878451
Change-Id: I0c71be2de6a8395a77116f0202e0ea8b793a5a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:26:17 +00:00
Bill Yi
ff73c31f01
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7
-s ours am: 88d6e11c70
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18878451
Change-Id: I542864da7a2aa0143e8844cf622d50a51e9b099d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:26:08 +00:00
TreeHugger Robot
2fc7ce6a84
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18878451
Change-Id: Iecbe81c431b6cc04486495437b6371eaded44fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:22:35 +00:00
Bill Yi
b70ab5079e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18878451
Change-Id: I1312de156a5f5507c3a041c1c1df699949cf55e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:22:16 +00:00
TreeHugger Robot
eb1d552ac2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18878451
Change-Id: I4b10e291ea2bf756c3cc9d25f5f222d34f2515de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:21:08 +00:00
Bill Yi
88d6e11c70
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18878451
Change-Id: Ia45c913ef45c94283d56c7952668f26cbf27b721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 01:20:48 +00:00
TreeHugger Robot
838099408b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-15 01:08:49 +00:00
Xin Li
d6c80bd8e3
Merge Android 12 QPR 3
...
Bug: 236045730
Merged-In: Ie1e14a6b697af624854a9360a60383fac63bb02c
Change-Id: Ib7885655035baa9aa6add39f7a169f7c84d48138
2022-06-14 16:48:16 -07:00
Jason Parks
4a9c108b28
Use API to check for the superivion component.
...
Bug: 219025233
Test: manual
Change-Id: Icd2593a67ae0297340991a5375b18e2f933facb1
2022-06-14 17:16:07 +00:00
SongFerng Wang
fa5a7f19dc
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
am: a5a729f523
am: 95f153642c
am: 3d14d61621
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: I9fa7870cf4bde35bbbb8e812b21495ae6c8ebd37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 08:00:44 +00:00
SongFerngWang
9231789a8a
[automerger skipped] Unable to enable the removable esim am: 56e1297abe
am: fbfaa331d2
-s ours am: a5ddd89091
-s ours am: 879118669a
-s ours
...
am skip reason: Merged-In Ibd324b781c84318c994e3742bb82e1d1393b94e4 with SHA-1 64430ba2d2
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121195
Change-Id: I56d4d681a6b26c45d5900870755f41e456c93b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 08:00:42 +00:00
SongFerngWang
f48a455919
[automerger skipped] Reuse the active esim slot am: 887bb592c8
am: da2d1d85aa
-s ours am: e74c1c4204
-s ours am: 8710ee1034
-s ours
...
am skip reason: Merged-In I6daa38f54abfaf67c7640d9dc8be0da02eb59554 with SHA-1 42aa247383
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121194
Change-Id: Idb331b36ebf749d4eb0aaf5fc0ee301d1b596e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 08:00:41 +00:00
SongFerngWang
1b701d688d
[automerger skipped] stop show preferred SIM card dialog during sim switch am: faf9baf95b
am: 886193184d
-s ours am: 82fb3dc1f5
-s ours am: 3af28e34a4
-s ours
...
am skip reason: Merged-In I242402e49b267c8cd61a85a46367c778d2d8bbf8 with SHA-1 c389149ff3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121193
Change-Id: Iab246cb16918657fbbbaa45c67dc4d13f2e8b292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 08:00:40 +00:00
SongFerng Wang
3d14d61621
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
am: a5a729f523
am: 95f153642c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: I1418690d52c1e74f74f5d2bbf731ab5170e2c101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 07:44:37 +00:00
SongFerngWang
879118669a
[automerger skipped] Unable to enable the removable esim am: 56e1297abe
am: fbfaa331d2
-s ours am: a5ddd89091
-s ours
...
am skip reason: Merged-In Ibd324b781c84318c994e3742bb82e1d1393b94e4 with SHA-1 64430ba2d2
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121195
Change-Id: I0353cccd4e527e8492502d2662e1db403b1fdd59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 07:44:36 +00:00
SongFerngWang
8710ee1034
[automerger skipped] Reuse the active esim slot am: 887bb592c8
am: da2d1d85aa
-s ours am: e74c1c4204
-s ours
...
am skip reason: Merged-In I6daa38f54abfaf67c7640d9dc8be0da02eb59554 with SHA-1 42aa247383
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121194
Change-Id: Id41d905e83f0178ca62d6479afd38e9bf5c6adbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 07:44:35 +00:00
SongFerngWang
3af28e34a4
[automerger skipped] stop show preferred SIM card dialog during sim switch am: faf9baf95b
am: 886193184d
-s ours am: 82fb3dc1f5
-s ours
...
am skip reason: Merged-In I242402e49b267c8cd61a85a46367c778d2d8bbf8 with SHA-1 c389149ff3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121193
Change-Id: Ibcb2b5923e98ba54dd0b2770c74d94c9ef0a33b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 07:44:34 +00:00