PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,327 Commits 1 Branch 0 Tags
a3a000426e66e09fbe8b89dab632ea62e6e9bd1a
Commit Graph

133327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin McClain
a3a000426e Remote authenticator enrollment finish layout. 
This flow will be included in Device Unlock settings with the
Fingerprint and Face Unlock.

Bug: b/293905106
Test: atest RemoteAuthEnrollFinishTest
Change-Id: I5d24e23948e508dcff5216cd63eba8d9fc9ec97f
 2023-08-08 14:19:20 +00:00
Treehugger Robot
317bfca133 Merge "[BiometricsV2] Refactor EnrollIntroViewModel" into main 2023-08-07 05:22:36 +00:00
Treehugger Robot
538eafcbf2 Merge "[BiometricsV2] Refactor AutoCredentialViewModel" into main 2023-08-07 05:22:13 +00:00
Treehugger Robot
49d3feaa74 Merge "[BiometricsV2] Fix skip action for udfps enrolling" into main 2023-08-07 05:19:08 +00:00
Chaohui Wang
79a978989f Revert^2 "Clean up unused WifiManager.ActionListener" 
This reverts commit c4a0abef8c.

Reason for revert: The original is not the root cause.
Root cause is b/294378814

Change-Id: Ib44ad912073b0f1b06c7ef6b6b998581eef65784
 2023-08-07 04:22:56 +00:00
Treehugger Robot
c001665f00 Merge "Clean up unused operator_warning" into main 2023-08-07 03:56:14 +00:00
Chaohui Wang
ab88423f55 Merge "Remove PreferenceXmlParserUtils deprecated methods" into main 2023-08-07 03:13:42 +00:00
Chaohui Wang
3cd47c1448 Clean up unused operator_warning 
Usage is removed in Change I9781af3a53fe7050b414f0574abb7618f8d71707.

Bug: 285231003
Test: m Settings
Change-Id: I89fb8630cc6bea4828b14936d5e2234de9f232ea
 2023-08-07 10:46:01 +08:00
Bill Yi
857778a856 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: dc3c4b2094 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8bcfa9bb6405fee9480c38b792835ef734af8653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-06 18:26:38 +00:00
Bill Yi
a2db0f037c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a43b3166b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72a57e0f28cd6cdf7ed1c9c4516770aed5b3cf24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-06 18:26:26 +00:00
Bill Yi
dc3c4b2094 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-08-06 17:58:17 +00:00
Bill Yi
19345f4f2f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 0e59758074 -s ours am: b3f9242eac -s ours am: 11d947dea5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5df2accb7f5ab4d5bd020a441fc923e27276bacc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 09:28:47 +00:00
Bill Yi
c406839008 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 9fd6cb2657 -s ours am: 989a977c08 -s ours am: 73b3372bac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id56c59c93c5b48f5ccdc304bbd0727d504442f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 09:27:16 +00:00
Bill Yi
c8b2f927a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 0e59758074 -s ours am: fab61ce9af -s ours am: 29a4f1128b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I403aca5ca90e6506cc70ec157da6041175de04a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 09:25:39 +00:00
Bill Yi
11d947dea5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 0e59758074 -s ours am: b3f9242eac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I276d04e23dfb4ebf4b220ea230925aa94743b37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 09:05:52 +00:00
Bill Yi
73b3372bac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 9fd6cb2657 -s ours am: 989a977c08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d0eeb71d096fd98950f416b658d34b76919e554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 08:44:53 +00:00
Bill Yi
29a4f1128b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 0e59758074 -s ours am: fab61ce9af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I58fa8245451b1781391e79b803f665bcefef9193
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 08:43:33 +00:00
Bill Yi
989a977c08 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 9fd6cb2657 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I849cae3eb42f08b897f3efd1067c33b0938b51c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 08:43:18 +00:00
Bill Yi
72431303bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 3cb66d7d11 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2daecd5f6678da7dd50b967052dd56ebd2b78ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 08:43:12 +00:00
Bill Yi
b3f9242eac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 0e59758074 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30985eb65054367e947348f01e183b85f70b2fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 08:19:17 +00:00
Bill Yi
fab61ce9af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 0e59758074 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id44c8896785823806fff3b659d28e650c5a2475c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 08:17:55 +00:00
Bill Yi
3cb66d7d11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f90881b22795c74f90cb278863d30dca53f6156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 07:57:34 +00:00
Bill Yi
9fd6cb2657 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0466cb03318c8f9ff67bd4039adf9d22fcbe7e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 07:56:51 +00:00
Bill Yi
0e59758074 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb0b6e5f6b38a23bece7bad0a115c3e4eb5e423c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 07:55:45 +00:00
Bill Yi
45eb3572ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bf6035ffd109a82ecc2cb743b57bf020cdb3053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 07:11:15 +00:00
Bill Yi
4e41110ffa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a1bb52d905 -s ours am: 66c20338cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27919413e45a559f0e26962aba3d8af3af5ce17e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 04:38:50 +00:00
Bill Yi
5facc5eedc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 031764a37e -s ours am: 1ea11c23d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5125714b843de1554557834a610fa5d81ea85b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 04:38:30 +00:00
Bill Yi
66c20338cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a1bb52d905 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I935a8d2761983ee33d40eaa9a3fc86ac96fd4be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 04:14:07 +00:00
Bill Yi
1ea11c23d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 031764a37e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2fd06938020ffb5a4f2431a845ef16e2fc11376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 04:13:36 +00:00
Bill Yi
a1bb52d905 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-05 03:31:44 +00:00
Etan Cohen
726bda1d98 Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev am: dca9c6b88f am: a20cb88cf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24285925

Change-Id: Ib3aa9df47d9fa91a2fa56c6d771b9da0c9d512f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 01:15:16 +00:00
Bill Yi
6a22fb9016 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: bdf848f6aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0437806701f509baaec77923322c4d963894fa1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 01:10:14 +00:00
Etan Cohen
a20cb88cf6 Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev am: dca9c6b88f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24285925

Change-Id: I687e5e85223d2b96d60667b1c203bd7264935cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 00:27:43 +00:00
Bill Yi
5851fc5654 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: af43c501e6 -s ours am: b1fd906ca0 -s ours am: 8dcafba811 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4678e8b0f4d757097c9a89171881c98a51481abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 00:12:27 +00:00
Bill Yi
7ce5c2c622 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: b8f4dd6e0f -s ours am: a71fa5cbcb -s ours am: 788bd701a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I379a4fbd0f33ae3e9c6d954eb1575689a5630dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 00:05:15 +00:00
Bill Yi
5b43a21a4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: b8f4dd6e0f -s ours am: 15cc28174c -s ours am: 1b5f0de9bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d9b44e9cbf01652a18b45223cfce902937630e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 23:40:11 +00:00
Etan Cohen
dca9c6b88f Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev 2023-08-04 23:36:38 +00:00
Bill Yi
a03fe23c0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f -s ours am: 5d99f9e9c2 -s ours am: f30fab1202 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib362518b8fa033e3253e5f5c19d6a345c3643065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 23:27:04 +00:00
Bill Yi
1f8014d833 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f -s ours am: b8d9ca8b86 -s ours am: 109fb512b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0a3da617a0686d2024159c23867d2dad785ed36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 23:22:27 +00:00
Bill Yi
8dcafba811 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: af43c501e6 -s ours am: b1fd906ca0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a794ab8b693e163c356240b0e2354a3fd4a20c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 21:36:13 +00:00
Bill Yi
788bd701a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: b8f4dd6e0f -s ours am: a71fa5cbcb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8f23e44989b7f0bfd060689a9599cff7864e236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 21:29:18 +00:00
Bill Yi
1b5f0de9bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: b8f4dd6e0f -s ours am: 15cc28174c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d678ad2ed4861198a6f0212251cc58da571c60a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 21:27:37 +00:00
Bill Yi
b1fd906ca0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: af43c501e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0471e7877dec7ef871218806ab38e37d1e348b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 20:53:12 +00:00
Bill Yi
a71fa5cbcb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: b8f4dd6e0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ffb7fc9f1f9285984b1b900338d2077a0d2703b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 20:45:40 +00:00
Bill Yi
15cc28174c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours am: b8f4dd6e0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1046b5ffb4a54a95a0f4406038b7c9862b137563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 20:44:19 +00:00
Bill Yi
f30fab1202 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f -s ours am: 5d99f9e9c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b03d44f414fd4ff2b3b32f73c658fdb8fc8590e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 20:17:30 +00:00
Bill Yi
bdf848f6aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0ed2cf9aee487bcec814bc39c50a5c1aab5f005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:58:55 +00:00
Bill Yi
af43c501e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9e098c8e0a6efbcc02f159772638b6549dc139f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:58:50 +00:00
Bill Yi
109fb512b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f -s ours am: b8d9ca8b86 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6059189741ee34ac105c261d991910250d2edbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:55:47 +00:00
Bill Yi
b8f4dd6e0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9b01d4dd30afbe01e3777c89da2a3db86943ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:54:35 +00:00