TreeHugger Robot
dee7be8277
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-07-16 18:36:03 +00:00
TreeHugger Robot
f21a4f42e3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233
-s ours am: f20ec29820
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: Ifd84d077cc733644d6e83c0809c5152eb9f43c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:59:29 +00:00
Bill Yi
bfae5967ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706
-s ours am: 6aa3b0a3a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I9b1559d098003b12a8d842856359353fbae3bf43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:59:12 +00:00
Bill Yi
de2831e2ee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4
-s ours am: cb2cb2e72a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I800d35d4c6a9807ea5a566fcf303612240cd3349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:59:01 +00:00
TreeHugger Robot
f20ec29820
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I7f6106fcdf78ce8f3a335c75a27bf8e794326ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:37:18 +00:00
Bill Yi
6aa3b0a3a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I989899b2f11e906218ee445f603d46973e88af05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:37:05 +00:00
Bill Yi
cb2cb2e72a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I39cd22fa5a5ece6def936a0501f4226b5925a414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:36:46 +00:00
TreeHugger Robot
8359385233
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-07-15 17:29:43 +00:00
TreeHugger Robot
f314593a69
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: If39d1081ebb04b14368037cc6a70087d045effa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:26:01 +00:00
Bill Yi
7130a59266
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I394197a50e1790daf85e8b414137df8aac5e4210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:25:44 +00:00
Bill Yi
1f4f268d56
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I61cef0ec239d8cdafd55713defc314110480ece0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:25:27 +00:00
TreeHugger Robot
7d8655936b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-15 16:56:40 +00:00
Bill Yi
fef55df6ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8d79670567a1f2b81f59e9a447c27fcde72a0c4e
2022-07-14 13:38:25 -07:00
Bill Yi
60b5937fb7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5e84134712147a92c064b7e0e85b58c201bb046e
2022-07-14 13:24:54 -07:00
Bill Yi
1c0e84757d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2406d1b52d61ddf1fcc9c52591719d43f1b1cb90
2022-07-14 13:19:37 -07:00
Bill Yi
cc75b57a54
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33596267597664aec4d58c3b7abbcdfd578e7bcc
2022-07-14 13:15:07 -07:00
Bill Yi
415f1b8706
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icdb743843e5eeee000e53ea68ae48f5cbff3da14
2022-07-14 01:20:34 -07:00
Bill Yi
3f841a2af4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibfecfad7ee6ee8cc86fefe7107d8e78bbbf40372
2022-07-14 01:17:02 -07:00
SongFerngWang
cf15fcf81d
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541
Change-Id: I902991da2b1b838d16fd799acd77fe064ece3bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 19:07:46 +00:00
SongFerngWang
286dce6b6e
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM
...
Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.
Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.
Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
2022-07-07 08:39:03 +00:00
Bill Yi
00ce7a948f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3
-s ours am: 1fd3156ec7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170611
Change-Id: Id3553d1cd90c1cb6665d184141836e8c7365bc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-06 06:01:48 +00:00
Bill Yi
f3be71db07
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804
-s ours am: 992e8328bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170611
Change-Id: Ic5f7eb29a2676dc6aaf8a27e49bc588292ae62c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-06 06:01:40 +00:00
Bill Yi
f93ba2665c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d
-s ours am: 50eb4245cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170607
Change-Id: I4cd5f4431b71081bb15851602691052d8250157b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-06 06:01:35 +00:00
Bill Yi
1fd3156ec7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170611
Change-Id: I4e9f640550a6ba839080bf5db6a76def2ca2f7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-06 05:34:08 +00:00
Bill Yi
992e8328bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170611
Change-Id: I6664f45591969573c47e8de87c2aa1f9015ddc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-06 05:34:05 +00:00
Bill Yi
50eb4245cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170607
Change-Id: Id50143411336cc13e6c029cb2789150b50544f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-06 05:33:54 +00:00
Bill Yi
44c1f479d3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-07-06 05:05:28 +00:00
TreeHugger Robot
8cfdb03d35
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-07-05 07:27:44 +00:00
TreeHugger Robot
16ec6ea598
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-07-05 07:27:44 +00:00
TreeHugger Robot
f9dd87268a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I2f0f272c0b31af2718f7794bb61792df519693c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:42:38 +00:00
Bill Yi
dafb394cbb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616
Change-Id: I3ab7d56a8aac838e698bb6c678a8fbf85940773b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 02:42:32 +00:00
TreeHugger Robot
e2cd20fa19
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-05 02:25:30 +00:00
Bill Yi
1ab546b2f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19169719
Change-Id: Ifbf36dc3562fb31343c8095d77827b58cd46a83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-05 01:51:11 +00:00
Bill Yi
72134f4c83
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaab33a1f7bdac3231cad97238a8e9cb23427dc58
2022-07-04 12:12:55 -07:00
Bill Yi
cab8532874
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6a7c146633f64ddf3a5b0810491dd8753be7d18b
2022-07-04 12:00:44 -07:00
Bill Yi
6da62ec091
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2abb57d1034b5786c72a0742ecd65698b585cd14
2022-07-04 11:54:35 -07:00
Bill Yi
2c65a1d804
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8fb18f2250c868b4015d64f81d830d0391799479
2022-07-04 11:50:26 -07:00
Bill Yi
219678d5f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2f5d0e5cc90099e42ad3a0b8e846d49c49f06735
2022-07-04 11:46:25 -07:00
Bill Yi
b55af7d44d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I457c216efddb0aff3f15c205d2bda71edc386e1b
2022-07-04 11:44:35 -07:00
TreeHugger Robot
0c8db6b115
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: I83cfaefc4223c6b00bc1585167cb0d01569de8f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 15:58:37 +00:00
Bill Yi
4a26414c9a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489
Change-Id: I00b52f58ed898321e90ad0c9cd17503261cf690e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 15:58:18 +00:00
TreeHugger Robot
ccd485016e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-01 15:38:52 +00:00
TreeHugger Robot
4842a09c97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255
-s ours am: f4cd4b3e68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: I4084ea5b9669b9a02542eb94426e5e58a304a88f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 01:19:31 +00:00
Bill Yi
ee8c7fc24e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3775e246dc
-s ours am: 917e5c6946
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: Ia58594c24ccdfd325e7ff60263affbefa4d5b6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 01:19:18 +00:00
Bill Yi
5e14eb7e87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b107521284
-s ours am: 76e5357179
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133156
Change-Id: Ie40221651ad682c6cb25beea2ab1a7af8ac9fbe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 01:19:08 +00:00
TreeHugger Robot
f4cd4b3e68
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: Icd1c31e6aabd54fe37a1b77672e5a1dcd283149a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 00:55:20 +00:00
Bill Yi
917e5c6946
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3775e246dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158
Change-Id: If9683f5b976bfab3918f005cc8b68fcf3ffd6049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 00:55:13 +00:00
Bill Yi
76e5357179
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b107521284
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133156
Change-Id: I33287c4d5f853781a2ed551193a7698a0164dcbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 00:54:56 +00:00
TreeHugger Robot
f2e5977255
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-07-01 00:34:38 +00:00
TreeHugger Robot
b0b1eccf2d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a7ad998247
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133163
Change-Id: Ic80f4a23b0aa1954c8bd55a22cad6cc8149f3269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 23:58:32 +00:00