Jason Chiu
2560c0df9b
Do not init dashboard categories when SetupWizard isn't finished yet
...
The generated category cache during SetupWizard flow is invalid.
Bug: 261885832
Test: manual
Change-Id: Id2108b2cc4ab557b086c4dbbd5dc7722c73e74d3
2023-06-01 16:07:53 +08:00
TreeHugger Robot
651ab436fe
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b am: c57d3de706
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: Ib9e80549565b7569499d77a140f6dacecd659a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 07:36:27 +00:00
TreeHugger Robot
d080579f54
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 28c9000bb7 am: 660be7a1f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: Iad8ddd8865edcde90ca077e8773228d354afbaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 07:32:22 +00:00
TreeHugger Robot
f8d5aca736
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b am: 60de9941fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: I8a4dfd2c636be1359f91dd907aec371749ed839a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 07:30:07 +00:00
Chaohui Wang
0937c24f8f
Unify the strings for Erase eSIM / eUICC
...
erase_sim_confirm_button & erase_euicc_data_button are the same string
and with same meanings, but since the description of
erase_euicc_data_button is wrong and causes translate issue, clean up
erase_euicc_data_button then.
Fix: 279600315
Test: Visual check on Erase eSIMs dialog
Change-Id: I5dec3dd5c1e851f84dd401dddd5416a27cb1a428
2023-06-01 15:28:47 +08:00
TreeHugger Robot
660be7a1f7
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 28c9000bb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: I0046c19bd45ed68c75f3a099c0558337a56c78c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:46:59 +00:00
TreeHugger Robot
c57d3de706
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: I15e5a054a77aafd21dcedea9b6a96a5b05b21e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:46:26 +00:00
TreeHugger Robot
60de9941fb
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: If6b861c8c84aafae60c2d74a86f5bf4c276462eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:43:22 +00:00
Chaohui Wang
b4758db2bd
Merge "Update comment for Settings_srcs build target" into udc-qpr-dev am: c27682642f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466979
Change-Id: I22a1864910fd6c5138d9a851f669326dbf7bc3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:06:59 +00:00
TreeHugger Robot
9f831a600b
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: Ia75886edc6211a05645e047bc627a95f923cd6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:02:59 +00:00
TreeHugger Robot
28c9000bb7
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: I8d186dbc0615dd277d6bd2ffd0272beac0280a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 04:57:15 +00:00
ykhung
e2f19b7de9
Update incompatible charger checking rule
...
Bug: 278316711
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I8f720bcdf7c0efabc8278913ccf1c0427c857fac
2023-06-01 12:50:47 +08:00
Chaohui Wang
c27682642f
Merge "Update comment for Settings_srcs build target" into udc-qpr-dev
2023-06-01 03:31:45 +00:00
TreeHugger Robot
f65da39f37
Merge "Fix TetherSettings crash issue" into udc-dev
2023-06-01 03:11:20 +00:00
Angela Wang
5176db8a71
Merge "Make Hearing devices preference always visible" into udc-qpr-dev am: 7df08d69be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429459
Change-Id: I3e7126da14c0882753a6edb69d4455a4d3db5030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 02:51:06 +00:00
Angela Wang
7df08d69be
Merge "Make Hearing devices preference always visible" into udc-qpr-dev
2023-06-01 02:04:50 +00:00
TreeHugger Robot
4a1651b742
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: becebd3a55 am: 48381cbd0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I3d1eff71edfed79705235612e69efc6032dd5030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 00:08:03 +00:00
TreeHugger Robot
c7584308b8
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: becebd3a55 am: e8b09f4e08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: Ie8cbd41cb9f9cbbdc2b2f6c1c494a5a6e7cda096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 23:39:53 +00:00
TreeHugger Robot
fee0027028
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: de73c2ff4f am: 6f4e93bf69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: Ib06e525c7b11a5438398e5d299fd575a2e200a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 23:39:37 +00:00
TreeHugger Robot
48381cbd0a
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: becebd3a55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I097932611469fa2b7db783946c6e189a8aced28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 23:17:37 +00:00
TreeHugger Robot
e8b09f4e08
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: becebd3a55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: Idb7ab9c55ecac681194919d8aeaab3fbcdf89c85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 23:15:19 +00:00
TreeHugger Robot
6f4e93bf69
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6 am: de73c2ff4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I56728e9c1d7dfac38b2969e16882be4d3f889c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 22:55:15 +00:00
TreeHugger Robot
becebd3a55
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I023988aa8e4e84af116b44a9c5fac1982b6183c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 22:34:47 +00:00
TreeHugger Robot
de73c2ff4f
Merge "Add more search terms for WPP" into udc-dev am: 2484fa72d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23436100
Change-Id: I7473173f5cb5c326e472af2091dfd472e10d5a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 22:30:25 +00:00
TreeHugger Robot
2484fa72d6
Merge "Add more search terms for WPP" into udc-dev
2023-05-31 22:02:49 +00:00
Bill Yi
e2a3688d1a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours am: 2d3730c6e0 -s ours am: 482e804031 -s ours am: a78f524653 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: I292b39a1ca16bc188bcbe3bac7a3801e59e4fb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 21:27:43 +00:00
TreeHugger Robot
df0a718812
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070 -s ours am: d26db6ce5a -s ours am: 34a8ceab26 -s ours am: d1f2308949 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I02e89537a64844b6b508bb39e72d4cc6f621602c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 21:26:30 +00:00
Bill Yi
448e14b4f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c -s ours am: 16f5f3cf3d -s ours am: 10cb85a272 -s ours am: 6d6aaf99c3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I3febcfd7942cf193f6c46eb7a6d2a5b3f1fae55f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 21:26:25 +00:00
Bill Yi
c293831bdd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce -s ours am: 58162acd2e -s ours am: b32544a324 -s ours am: a2a3d37e28 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: Ifcf594663f91ddc579b49d08fc9ccea4a0151f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 21:25:34 +00:00
Bill Yi
a78f524653
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours am: 2d3730c6e0 -s ours am: 482e804031 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: Iaa0d013a240cecbdd9b4d8b2eb92ec2f91700d53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:44:51 +00:00
TreeHugger Robot
d767cdc334
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070 -s ours am: d26db6ce5a -s ours am: cc1e3a7a22 -s ours am: 89ecf64450 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: If4ccfb3640007d2e2e3dfc323c3eda075a4c117b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:40:37 +00:00
Bill Yi
434c11009b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c -s ours am: 16f5f3cf3d -s ours am: e4de5ed4b8 -s ours am: f362da94be -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Ie2da0cb69781939b6821f3758f2139ad4659d969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:40:33 +00:00
Bill Yi
f2391b116b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce -s ours am: 58162acd2e -s ours am: fea2cb0758 -s ours am: e7a8d7f38e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: Id1acaa0a277db7ddf35151943c3757a15863ecb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:38:48 +00:00
TreeHugger Robot
2789b68d61
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070 -s ours am: d26db6ce5a -s ours am: 34a8ceab26 -s ours am: 4d94d4e932 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Ib27072778b8a4fda0e9ed41ddaa3cd35bb930283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:31:33 +00:00
Bill Yi
ef22796047
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c -s ours am: 16f5f3cf3d -s ours am: 10cb85a272 -s ours am: 92615faf3d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I29ba48dc3c3b4cba9e850e5a5cd8048371088ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:31:27 +00:00
TreeHugger Robot
d1f2308949
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070 -s ours am: d26db6ce5a -s ours am: 34a8ceab26 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I045f46e7e443b4e245344f91363b6083a2f242c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:31:10 +00:00
Bill Yi
6d6aaf99c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c -s ours am: 16f5f3cf3d -s ours am: 10cb85a272 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: I66098ec0df491fdb60315c3e83e3052f1fab2557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:31:05 +00:00
Bill Yi
a2a3d37e28
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce -s ours am: 58162acd2e -s ours am: b32544a324 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: I22327612124f26e02462b565ac2eb3608cf70268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:28:20 +00:00
TreeHugger Robot
89ecf64450
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 672ba73070 -s ours am: d26db6ce5a -s ours am: cc1e3a7a22 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Icca7c29a901376a860acb925935adb118e49c518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:19:59 +00:00
Bill Yi
f362da94be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c -s ours am: 16f5f3cf3d -s ours am: e4de5ed4b8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467654
Change-Id: Iafc08a422156419ee6144fd69781858d1cc52ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:19:54 +00:00
Bill Yi
ea2b187fed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9d26cfdce -s ours am: 58162acd2e -s ours am: b32544a324 -s ours am: dd3aa0a710 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467653
Change-Id: Ib8df99de50f6acb2b6cb803e5c71345fb0d090ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 20:14:10 +00:00
TreeHugger Robot
adc91b7a38
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours am: 53a315463c -s ours am: e665a6bb57 -s ours am: b373293384 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: Idaa2078141193402693510891923b2897642e761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:59:00 +00:00
Bill Yi
d064c2d330
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours am: 5b8058c497 -s ours am: b0a242da0e -s ours am: 0c82713b0c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I76587682ad5ce02893723ddd8852125a890ce659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:58:56 +00:00
Bill Yi
482e804031
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours am: 2d3730c6e0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: I97e3326beded265be1c410580efc01077c73f3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:56:50 +00:00
TreeHugger Robot
8d9c92596a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours am: 53a315463c -s ours am: 352a55249d -s ours am: b234c9d476 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I33c1f3f7626fe85c0497e9df6d3e290cd6a84e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:56:26 +00:00
Bill Yi
960eb99f2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours am: 5b8058c497 -s ours am: 5ef725d59a -s ours am: 93430154f2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I6c60b9010e4d72235c20156403231073596e15b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:56:22 +00:00
Bill Yi
b0509847b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours am: 3365a09592 -s ours am: c4f7b4c792 -s ours am: 6ffaa03d9d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: I5eff0d9076959cae3897474de608d68e1525c5eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:55:50 +00:00
TreeHugger Robot
473397b0ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6834cfffe4 -s ours am: f8b09e115a -s ours am: 40d10d5a57 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: Icc2ab705f0c9579bb2d2a02b7389e3eefaeb78ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:55:20 +00:00
Bill Yi
b2b7dae191
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57ebe9c3b -s ours am: 27cdb764dd -s ours am: a7de1c1abc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467802
Change-Id: I74ce0e3e3d2d938003fd07a9042957e5f461b87b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:55:13 +00:00
TreeHugger Robot
e8d108d1a6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e -s ours am: 647555b203 -s ours am: bffbb20d5a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467800
Change-Id: Iff637e83b03c317b5cce59688c2a819673039935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 19:55:06 +00:00
