PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,577 Commits 1 Branch 0 Tags
09eca5f43e21db79e5c00f539bde1f08abf003d7
Commit Graph

130577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matías Hernández
0166bcc776 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I33040a000b1bc4e90b9e76c8e751bca2e09959d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:10:59 +00:00
Matías Hernández
2b1faa0aea Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I715da9406bd9d3fe88ff7b5353db1780109880e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:09:53 +00:00
Matías Hernández
b971690a4e [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26937792ea087b7b2516e71525fa12602d312696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 14:26:51 +00:00
Matías Hernández
0aa241be99 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I8cd7cc9605b3728f9f96c3479d17aa1b362d9cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 14:22:10 +00:00
Matías Hernández
a49e14f8ff Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I840d7836ae899bcd40eafc772b96c9460c3f8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 13:42:07 +00:00
Matías Hernández
78a4048eac [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifee74173a3e0f410d4d76f06149b496a9ae62241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 13:40:43 +00:00
Bill Yi
15b3905583 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-14 13:21:34 +00:00
Bill Yi
e689c94435 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-14 13:21:34 +00:00
Bill Yi
bf7dfbc5fe Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-06-14 13:21:34 +00:00
Matías Hernández
50df60c93c Don't hide approved NLSes in Settings am: ff255c6eda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 12:57:15 +00:00
Matías Hernández
d7608c84b4 DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581

Change-Id: I11ee7cc3bfd291f32e602eff65ce93ba57bcc407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 12:52:41 +00:00
Treehugger Robot
03b39bc5d3 Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725

Change-Id: I6e8bb778a0c9a7e45965bebe6605bac76915aad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 12:28:49 +00:00
Treehugger Robot
3494d09de4 Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev 2023-06-14 12:00:21 +00:00
TreeHugger Robot
645694c99d Merge "[BiometricsV2] Refactor dialogs/helper to kotlin" 2023-06-14 11:51:55 +00:00
TreeHugger Robot
2522dff5f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f2f899106d -s ours am: bfcd9613f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9fc62da10e83842b89b793aedcf7b79b5d742782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:29:56 +00:00
Bill Yi
dcf6e6d7b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6f09ef6f0 -s ours am: e2b859d86f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I621c8f496adad5f7194089ebb06fd0e2fd01efa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:29:46 +00:00
TreeHugger Robot
515a8eddaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 3b89844e7f -s ours am: d110250b6c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03e8ea1435a225d3d1dee69a48e6322f56d91afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:29:38 +00:00
Bill Yi
e5d67bf940 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1407e61f1 -s ours am: e1c47d39a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25898f6605a811e0908f7e1b3cf33ec7703f795c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:29:27 +00:00
TreeHugger Robot
b219351e42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6fd46cf3a3 -s ours am: 97f52a705d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c7737478ca5a250a22d8a49163bbb7e87a0cf9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:29:08 +00:00
Bill Yi
bc930ed5e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8430cda6d3 -s ours am: 162ca4c3e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I171b0b2d7b81a110f91aab2b1820ebb7513f68ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:28:45 +00:00
TreeHugger Robot
bfcd9613f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f2f899106d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82ef8a5284c15bc7d6c8bfc63e7ea57cac87d9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:06:48 +00:00
Bill Yi
e2b859d86f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6f09ef6f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69f8255e3330569e7b8a50f3402aee0291400166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:06:38 +00:00
TreeHugger Robot
d110250b6c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 3b89844e7f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38910b55fe58dfc205048f194f49336e2cb9ff18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:06:31 +00:00
Bill Yi
e1c47d39a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1407e61f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4af1da0e984c72c139fb76b63fefe6c178013c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:06:14 +00:00
TreeHugger Robot
97f52a705d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6fd46cf3a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7d5ac7f4ea609180334f66b61f42b47f1201d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:05:57 +00:00
Bill Yi
162ca4c3e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8430cda6d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I248613757200e08eafa31b06a62f4019ad5257fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 11:05:36 +00:00
Weng Su
6a20a8c5df Fix Hotspot & tethering settings crash 
- Cannot omit addPreferencesFromResource even if UI is restricted

Bug: 287172382
Test: manual test
atest -c WifiTetherSettingsTest

Change-Id: I1f5c0215a635fddefe7eaa20c1d765634b505121
 2023-06-14 18:59:30 +08:00
Milton Wu
7a71b59ca3 [BiometricsV2] Refactor dialogs/helper to kotlin 
1. Refactor Dialogs/GlifLayoutHelper to kotlin
2. Add bindView() for Dialogs

Bug: 286197243
Bug: 286197247
Test: atest FingerprintEnrollmentTest
Test: atest biometrics-enrollment-test
Test: Manully show these dialogs
Change-Id: If047f48f8380f03ad8ab3ba55c98c3e745be1eea
 2023-06-14 18:53:16 +08:00
SongFerng Wang
2a6553b122 Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8 am: 7f29649aa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23688861

Change-Id: Ie4d1c3582b63c446f145c008d390d3b0f37a8584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 09:51:23 +00:00
SongFerng Wang
7f29649aa9 Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772

Change-Id: I278260f1a36ed24fd1ca2d53ffc7ff2431fd1005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 07:54:48 +00:00
Treehugger Robot
89a6c162de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: 2f6b7bea9b -s ours am: 1adf54b282 -s ours am: 688c012a3f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I877cfbc60b4b4e30ed5284dc5ed4d0beace650b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 07:11:47 +00:00
Bill Yi
9af8ff8051 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: 39dbfc2e78 -s ours am: f49484b2d7 -s ours am: 723eeee433 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib93b586fd2dd336880dd7b702cfca91924ce9eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 07:11:42 +00:00
Treehugger Robot
4586c1ab12 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: e2ee732578 -s ours am: 104870a508 -s ours am: c08531f0e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I742ff2e62783b0edc2ea7634ce0760ac57aedecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 07:10:45 +00:00
Bill Yi
96024894ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: a49576b187 -s ours am: e5ed4f2cb0 -s ours am: 9f5aacb024 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb19e17f06d5755b374604f34f195fd34624f197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 07:10:41 +00:00
Treehugger Robot
12deec820f Merge "[BiometricsV2] Refactor model code to kotlin" 2023-06-14 06:39:01 +00:00
Treehugger Robot
688c012a3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: 2f6b7bea9b -s ours am: 1adf54b282 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35f05ac81d0d9cfdc288f9d2480c3f3606a596b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:21:12 +00:00
Bill Yi
723eeee433 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: 39dbfc2e78 -s ours am: f49484b2d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I123e158f045f6be76dcc5977335faec2fd460a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:21:10 +00:00
Treehugger Robot
c08531f0e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: e2ee732578 -s ours am: 104870a508 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51745df13117daff87b82534a107a9d25ef4ca78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:20:38 +00:00
Bill Yi
9f5aacb024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: a49576b187 -s ours am: e5ed4f2cb0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I212e28f5627502255f7bb0c182d9ec712b14617a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:20:28 +00:00
SongFerng Wang
61ef9024c8 Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772

Change-Id: I9b061b1c90bc7033e4400d192ed5211e9ea9bb13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:20:17 +00:00
TreeHugger Robot
c358727f7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I379721e942351a8ad3c9bd51a6ee4bd23fa96465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:04:06 +00:00
Bill Yi
7b59426838 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92231aca61cd8065cc97abb427843e8f157dd393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:03:56 +00:00
TreeHugger Robot
2d110c54dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6bcb09fac84acbc00d7580c025e39125268ab935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:03:48 +00:00
Bill Yi
03aece6855 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b47c44e4dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I906d990cc3237eac3a3973a39e69fcced958f6b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:03:18 +00:00
TreeHugger Robot
49a26f49c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c937ce7a22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62cb6cb14706ebed57a4ef86fc7a6b2d4f33b2a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:02:58 +00:00
Bill Yi
4f14f98b2f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4dfc8f0a08cb8ba7a98b4bfd59df504c3892debf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:02:41 +00:00
Treehugger Robot
1adf54b282 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: 2f6b7bea9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3df7676bdca57767633a9068f66658c379a34001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:01:13 +00:00
Bill Yi
f49484b2d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: 39dbfc2e78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee9cc5897a9985b66390654871a592df1e973dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:01:10 +00:00
Treehugger Robot
44f5ff47a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: ff2819cd07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I220e910f7baae53b291e3d819a246fd05edcfdae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:57:47 +00:00
Bill Yi
ec945b0ccf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: 46aaf36b34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I982aa956641a5729e04f6cbf9a69ef6a8ace28e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:57:45 +00:00