Commit Graph

142795 Commits

Author SHA1 Message Date
Daniel Norman
a20f69cceb [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: 1dde2be0b7 -s ours am: 460b6479b3 -s ours am: a19dd67e4a -s ours am: 4f88f6fc76 -s ours
am skip reason: contains skip directive

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

Change-Id: Icd3f4ee0ccbb36494b97b43900435748071da4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:49 +00:00
Daniel Norman
962a7102d7 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 51113ad5ef am: 1a28bf00d3 -s ours am: 128786e8c6 -s ours am: cc01e7ca47 -s ours
am skip reason: contains skip directive

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

Change-Id: Ie222673cfa483f30ada794a44a456e00bfec32ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:23 +00:00
Daniel Norman
4f88f6fc76 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: 1dde2be0b7 -s ours am: 460b6479b3 -s ours am: a19dd67e4a -s ours
am skip reason: contains skip directive

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

Change-Id: I58969e8ff87db39c9b0489a0e6d821fe63e47dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:06:07 +00:00
Daniel Norman
cc01e7ca47 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 51113ad5ef am: 1a28bf00d3 -s ours am: 128786e8c6 -s ours
am skip reason: contains skip directive

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

Change-Id: Id73e6c3c840deaf906dfab718bb003b335b82034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:05:48 +00:00
Daniel Norman
16670afa7f [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: f5ed34f494 -s ours am: 1d951d8117 -s ours am: 6e27532ac9 -s ours am: 634c22f15b -s ours
am skip reason: contains skip directive

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

Change-Id: Ib0c1230249b1a0405e6261bdaee1d0d155291686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:56:55 +00:00
Automerger Merge Worker
18b88e2c53 Merge "[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 4139b9fa1e -s ours am: 69fbc355c6 -s ours am: f77fcc43c7 -s ours am: 22e0d7d7da -s ours" into main 2024-08-22 00:56:50 +00:00
Daniel Norman
10a1190590 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 4139b9fa1e -s ours am: 69fbc355c6 -s ours am: f77fcc43c7 -s ours am: 22e0d7d7da -s ours
am skip reason: contains skip directive

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

Change-Id: I332d2045b99cd8dbd6904b6629a3a005de6f7554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:56:44 +00:00
Daniel Norman
eefd1fb391 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: f5ed34f494 -s ours am: 1d951d8117 -s ours am: b2dea8b011 -s ours
am skip reason: contains skip directive

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

Change-Id: I6c59b7673a841dc8518ffc8301c313f253236459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:56:42 +00:00
Automerger Merge Worker
4284389636 Merge "[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563 am: ab7fcdc99a am: 385ac3fa8a -s ours" into main 2024-08-22 00:56:40 +00:00
Daniel Norman
e9d2de871b [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563 am: ab7fcdc99a am: 385ac3fa8a -s ours
am skip reason: contains skip directive

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

Change-Id: Ib35f76b22881021be007026e578d21a95a5f0c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:56:34 +00:00
Daniel Norman
04b2eabb52 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 4139b9fa1e -s ours am: 69fbc355c6 -s ours am: 6077ef2525 -s ours
am skip reason: contains skip directive

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

Change-Id: Icfdd8792637654f1e5eca3c802c12b145e8e92c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:56:29 +00:00
Daniel Norman
a19dd67e4a [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: 1dde2be0b7 -s ours am: 460b6479b3 -s ours
am skip reason: contains skip directive

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

Change-Id: I0f4d8db56322565f091ab4ede92abd6601d1821b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:56:09 +00:00
Daniel Norman
634c22f15b [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: f5ed34f494 -s ours am: 1d951d8117 -s ours am: 6e27532ac9 -s ours
am skip reason: contains skip directive

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

Change-Id: I1e9b1c6a1c69ca4843e955d02151be3db541a1c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:56:06 +00:00
Daniel Norman
22e0d7d7da [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 4139b9fa1e -s ours am: 69fbc355c6 -s ours am: f77fcc43c7 -s ours
am skip reason: contains skip directive

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

Change-Id: I3943d22b1ec70283b302bd88f223a700a3ab1849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:55:55 +00:00
Daniel Norman
128786e8c6 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 51113ad5ef am: 1a28bf00d3 -s ours
am skip reason: contains skip directive

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

Change-Id: Ib2bd945d9b106ed30c1f3bf0192cadd086080e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:55:38 +00:00
Daniel Norman
6e27532ac9 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: f5ed34f494 -s ours am: 1d951d8117 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia9ecfb21fd2ece4d8d0a8ac5a3f261f1d75672b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:48:14 +00:00
Daniel Norman
f77fcc43c7 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 4139b9fa1e -s ours am: 69fbc355c6 -s ours
am skip reason: contains skip directive

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

Change-Id: I91a0b0152fc0cd9171dc679ddfe9b874adbd170f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:48:05 +00:00
Daniel Norman
b2dea8b011 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: f5ed34f494 -s ours am: 1d951d8117 -s ours
am skip reason: contains skip directive

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

Change-Id: Id722f2af9226d3539ac538eca9c62e6424c8b3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:47:58 +00:00
Daniel Norman
6077ef2525 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 4139b9fa1e -s ours am: 69fbc355c6 -s ours
am skip reason: contains skip directive

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

Change-Id: I52ef3971597c0d8bb6f1af1dde3ec64ee2c8196f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:47:47 +00:00
Daniel Norman
460b6479b3 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: 1dde2be0b7 -s ours
am skip reason: contains skip directive

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

Change-Id: I6f6949dc1d8e93350f3d5518576a122cad6eb589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:39:54 +00:00
Daniel Norman
1d951d8117 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: f5ed34f494 -s ours
am skip reason: contains skip directive

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

Change-Id: I906f0038c387d3062cb1df6dae735130a67723f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:39:53 +00:00
Daniel Norman
69fbc355c6 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 4139b9fa1e -s ours
am skip reason: contains skip directive

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

Change-Id: I3ad3604b76068825ef76f18f2216b69fa2e86ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:39:42 +00:00
Daniel Norman
1a28bf00d3 RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 51113ad5ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654

Change-Id: I8d823e7b82a69e924adcc6559289aeb4f46cce04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:39:22 +00:00
SongFerng Wang
2c57734b06 [automerger skipped] Catch IllegalArgumentException when getting provisioning status am: b781605c1e am: f8863ca737 -s ours
am skip reason: Merged-In Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a with SHA-1 37e1d258f8 is already in history

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

Change-Id: I94ac8291b4d0f319ac1a58015449020e87a7d78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:39:00 +00:00
Daniel Norman
385ac3fa8a RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563 am: ab7fcdc99a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807176

Change-Id: I5a5d5af46a986e3d8ce1ae437124a56b7f52ca67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:39:00 +00:00
SongFerng Wang
f8863ca737 Catch IllegalArgumentException when getting provisioning status am: b781605c1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28930152

Change-Id: Iab377d3822de137bd5ec8ab7f98d85456218a8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:31:44 +00:00
Daniel Norman
1cf8e553af [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563 am: 2652cb6236 -s ours
am skip reason: contains skip directive

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

Change-Id: I4892fd6f3c52d93e4da33e1dc27e5ce6723b89a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:23:46 +00:00
Daniel Norman
1dde2be0b7 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours
am skip reason: contains skip directive

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

Change-Id: I43be992e04c5a05f4c844464c79ed7f11d3b1e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:23:04 +00:00
Daniel Norman
f5ed34f494 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours
am skip reason: contains skip directive

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

Change-Id: Ied30a43fcf228c7da92151e163d45ef07ebca961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:23:01 +00:00
SongFerng Wang
b781605c1e Catch IllegalArgumentException when getting provisioning status
getProvisioningStatusForCapability still need the IllegalArgumentException when the subId is -1.

Bug: 346600036
Test: manual test. Disable sim and the settings did not crash.
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:37e1d258f88c5129035501d6ced1dab6627da102)
Merged-In: Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a
Change-Id: Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a
2024-08-22 00:20:29 +00:00
Daniel Norman
8024751b9e [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours
am skip reason: contains skip directive

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

Change-Id: I95295b46d96f7edbf4ea14911083bbde3c2c2f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:16:52 +00:00
Daniel Norman
ab7fcdc99a RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807176

Change-Id: I5e6ef098392c1d9d5cb87a61bbf39cf4e51095f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:16:39 +00:00
Daniel Norman
2652cb6236 RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 25ecee0563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807176

Change-Id: I0894ff7c5c10128c096a8a9d161b8e53607a7c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:16:19 +00:00
Daniel Norman
51113ad5ef RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654

Change-Id: I701845d7ff26c82b6dda7894e9597bb8929aaf86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:16:11 +00:00
Daniel Norman
4139b9fa1e RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28806654

Change-Id: I312e63382e673d3f2661dbf0a82e8181c8aaa6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:16:07 +00:00
Treehugger Robot
b0b3269725 Merge "Stops hiding a11y services with the same package+label as an activity." into main 2024-08-22 00:03:59 +00:00
SongFerng Wang
37e1d258f8 Catch IllegalArgumentException when getting provisioning status
getProvisioningStatusForCapability still need the IllegalArgumentException when the subId is -1.

Bug: 346600036
Test: manual test. Disable sim and the settings did not crash.
Flag: EXEMPT bugfix

Change-Id: Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a
2024-08-21 10:28:20 +00:00
SongFerng Wang
db74ac1256 [automerger skipped] Fix IllegalArgumentException when getProvisioningStatusForCapability am: d67de483b4 am: 8761b34cf4 -s ours
am skip reason: Merged-In Ib682b336fdfc4c79a8b3e2fa5ccac8fe9c4e7ba1 with SHA-1 370445b773 is already in history

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

Change-Id: I2e9473d8c92e204d2b6d9740506e479891813a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 08:34:04 +00:00
Treehugger Robot
132b11aaa8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 0f7f296faf -s ours
am skip reason: contains skip directive

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

Change-Id: I82f61c4c282f32d7e865d3f603fcb49e70769056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 08:28:25 +00:00
Bill Yi
3f0b830176 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ddd2c7953 -s ours
am skip reason: contains skip directive

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

Change-Id: I00277328ae4a14ad3d5b8cb963cb59870fb6fc34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 08:28:17 +00:00
Treehugger Robot
dd030d5048 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 042aab512b -s ours
am skip reason: contains skip directive

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

Change-Id: I137662ace9193596256512726e2aa37bc4e26cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 08:28:12 +00:00
Bill Yi
6b8c7219e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00dd7dff9c -s ours
am skip reason: contains skip directive

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

Change-Id: I510354755347d07b54b56ef673bf7962b9a03684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 08:28:06 +00:00
Bill Yi
5ba63c36d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2125e64a47 -s ours
am skip reason: contains skip directive

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

Change-Id: I92e97c96a9975347033a61c9ec06e8809056be9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 08:24:29 +00:00
SongFerng Wang
8761b34cf4 Fix IllegalArgumentException when getProvisioningStatusForCapability am: d67de483b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28900489

Change-Id: I9e701d326af7239f842611cb0574e18f05a5d34e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 08:24:08 +00:00
Bill Yi
4560289e11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68b9feb5d -s ours
am skip reason: contains skip directive

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

Change-Id: Ie044b9464cefdc0c3b89025ab0c060c4d68e6c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 08:12:22 +00:00
Treehugger Robot
998c72f836 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-08-21 07:56:18 +00:00
Treehugger Robot
3962159cd2 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-08-21 07:56:18 +00:00
Treehugger Robot
827add6f0c Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-08-21 07:56:18 +00:00
Treehugger Robot
0f7f296faf Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-08-21 07:54:25 +00:00
Treehugger Robot
042aab512b Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-08-21 07:54:25 +00:00