PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,702 Commits 1 Branch 0 Tags
78f3760d26a30cae2637b812497f25e5afdb19cc
Commit Graph

132702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
28cf36e37d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0fe5b71d7ef1901d3b7238e0cd8db2fcafaffda7
 2023-06-22 22:09:39 -07:00
Bill Yi
e2abc0ab7a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia036b42598639dac49342562f238cb378b3f6091
 2023-06-22 22:06:04 -07:00
Bill Yi
d772bd36b1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I22bbb5c016e705cbc07f4824acd0d33f9e094e98
 2023-06-22 22:04:11 -07:00
Bill Yi
374a3112e3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4477e0289b2b1cc331320e550cef7f74ec2af74e
 2023-06-22 22:02:27 -07:00
Bill Yi
364eb998be Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9aa9cc04f3cff9f455ced6d6fe8b384c4954b21f
 2023-06-22 21:57:59 -07:00
Hao Dong
59a4bf3565 Merge "Fix require on screen toggle on guest user." into udc-qpr-dev am: 800728a5a6 am: 7461036d68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23714620

Change-Id: I62554d897396b165f02bac58b0d1d9673a409033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 04:56:28 +00:00
Hao Dong
7461036d68 Merge "Fix require on screen toggle on guest user." into udc-qpr-dev am: 800728a5a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23714620

Change-Id: I77aa61c6d6f3f52e275754f17e56586e335da2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 03:30:11 +00:00
Bill Yi
535f18a044 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours am: df60aeda89 -s ours am: 5dcfd74b68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d4a05b80458810adad2998116bac521064b6a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 02:49:54 +00:00
Hao Dong
acd49a49d3 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: 02f72c16ae am: 7068c74788 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: Ibc76f32f310cac1beda8d7b4391414e7385c64ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 02:49:35 +00:00
Bill Yi
ad101066fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: ced4e8df8b -s ours am: 7f8405f202 -s ours am: 2f48b3fbeb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If721372ab10ab38f8b485edec89a27f3c8ae953a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 02:48:03 +00:00
Automerger Merge Worker
6e0b42c750 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours am: abce7eb398 -s ours am: b6f86a13a1 -s ours" 2023-06-23 02:46:31 +00:00
Bill Yi
41314838c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours am: abce7eb398 -s ours am: b6f86a13a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I784c78d3056f2d7448c01beb876ba777455d2a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 02:45:51 +00:00
Bill Yi
fb0ee6000c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: 000297ad9a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icad720aebac5b4fa314befe15d19a07f720f2f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 02:45:42 +00:00
Hao Dong
70c833b8a2 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: d44eccbc5f am: 3f4a489b02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: Icf8b4f61424f79b4599c530d1aefe88d6cd6a795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 02:45:31 +00:00
Hao Dong
35ebdefcd8 Fix pattern rotation header text. 
Bug: 278055194
Test: atest ChooseLockPatternTest
Change-Id: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
 2023-06-23 02:37:22 +00:00
Hao Dong
800728a5a6 Merge "Fix require on screen toggle on guest user." into udc-qpr-dev 2023-06-23 02:36:48 +00:00
Bill Yi
5dcfd74b68 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours am: df60aeda89 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id49c775b6d0d36cf406d1526b2b9553affdf415c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 01:41:32 +00:00
Hao Dong
7068c74788 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: 02f72c16ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: I815fbabdcbb85db29488456b06317a9eb234b8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 01:41:13 +00:00
Bill Yi
2f48b3fbeb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: ced4e8df8b -s ours am: 7f8405f202 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b81e71cc049626cdf4a118b6bd5892aa8014f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 01:37:47 +00:00
Bill Yi
b6f86a13a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours am: abce7eb398 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4d2b551f9b4ac10f67e85f263b78a90f49e80c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 01:36:20 +00:00
Hao Dong
3f4a489b02 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 am: d44eccbc5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: Id3aaa0b9e529de1dfde98decec6095f79e4b71f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 01:36:00 +00:00
Bill Yi
df60aeda89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94edf14e689094253de4006030f3a490663445ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:52:55 +00:00
Bill Yi
7f8405f202 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: ced4e8df8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I586cf6243fbdba7f4328b2e1da4bcd1bee4394e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:52:45 +00:00
Hao Dong
02f72c16ae Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: I97978a19733bc19904bd7fb72d80955e1f400d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:52:35 +00:00
Bill Yi
17b0c3bc7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: 71efddfbbb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a65c035e2e4c9a9c7fd5973b752552b33bfd508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:51:10 +00:00
Bill Yi
abce7eb398 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib41319892c8e30df912b6b529c02d7cac84249e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:50:54 +00:00
Hao Dong
d44eccbc5f Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: Idc66a1838b701b91affa038a581b1410b78115a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:50:35 +00:00
Hao Dong
c9a99978f9 Fix require on screen toggle on guest user. 
Bug: 286018876
Test: atest FingerprintSettingsFragmentTest
Change-Id: I432ffd3b8b32caeaf7ac8c6bc3c2ee2a0ee53a08
 2023-06-23 00:32:32 +00:00
Bill Yi
ced4e8df8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28473ca95c4f26f45811162685f95dfad0d1c57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:07:56 +00:00
Bill Yi
71efddfbbb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f2a7f5f4f64f91190a8e92147f73cc703e1d5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:07:42 +00:00
Bill Yi
000297ad9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d9440a38e60d8fb826e1caeeeb5661b01eb9529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:07:18 +00:00
Bill Yi
d2fa0c27de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I452f11e910b1b1c99ed2d8cd06c5915f6df6d1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:07:11 +00:00
Hao Dong
0f63a450a8 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev 2023-06-22 23:58:55 +00:00
Eric Biggers
b547094366 ChooseLockPassword: convert to use PasswordMetrics#validateCredential() 
Fix the check for invalid characters in new passwords by switching from
PasswordMetrics#validatePassword() to
PasswordMetrics#validateCredential().  For more information, see
frameworks/base change I5c3c55367c3a294578cd0f97ac0e315a11ed517e.

Bug: 219511761
Bug: 232900169
Bug: 243881358
Test: Verified no regressions in 'atest ChooseLockPasswordTest'.  Note,
      this test is currently @Ignored and has 2 failures.  I didn't
      attempt to address that.
Test: Set a password containing non-ASCII characters on a device running
      an older build.  Upgraded and verified unlocking still works.
      Tested that setting a new non-ASCII password is not allowed.
Change-Id: I5f1822a34688473cb103eb64dca56e4c19d4dd08
 2023-06-22 20:59:22 +00:00
Bill Yi
24a7a54341 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8fceb2c2cb46e03d76cab54b1348030cf61b788c
 2023-06-22 10:35:13 -07:00
TreeHugger Robot
ea165620ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 2461b42f22 -s ours am: b30f4fb6ae -s ours am: 6377e84290 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3c08f4352808093349096cabc7f0352f8475974
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 10:40:14 +00:00
Bill Yi
bcf76d6c9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: b9ebaae7af -s ours am: b6e9b3a532 -s ours am: 8fa10d8716 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic33193d6463ee7337645f996277cea1c5d914f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 10:40:02 +00:00
Bill Yi
0765547587 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: a0c53d9c73 -s ours am: bf69a5d059 -s ours am: f9d072155d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I296e46f60cf5175b80ef8ecdebbd60f3a4114068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 10:39:44 +00:00
TreeHugger Robot
423d5fff18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 1485ceaf97 -s ours am: 0e8155050c -s ours am: 5e98af0a91 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id0e575a934bd29c165dc90229e00e5c919a23c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 10:31:58 +00:00
Bill Yi
62852e6d15 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: 422c0622e8 -s ours am: 8690fea740 -s ours am: b76c8a7dd1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7dc3b6061d972f654b3827726d8d572247e18583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 10:31:44 +00:00
Bill Yi
55614048c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: 121dcd4d85 -s ours am: 1129578e20 -s ours am: c6ca20ad8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3bc815eaa555e29ac2163960a0b8e6ba189b785c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 10:31:26 +00:00
TreeHugger Robot
e8fd31daac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 2461b42f22 -s ours am: 0bc2775be5 -s ours am: 65d2a5bb1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b9064b76019ea9054944514a082fc4daf7e9f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 10:26:08 +00:00
Bill Yi
ee1c3e5bf5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: b9ebaae7af -s ours am: 6ac2ee3478 -s ours am: 1e57556086 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7dfb13b799b60503328f31b3cd4ecbe357e06d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 10:25:58 +00:00
Bill Yi
e9b7d71224 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: a0c53d9c73 -s ours am: ef507ad201 -s ours am: 99a70a764a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8355cb9796d0087cf8afd39c25d3eb2f4631845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 10:25:38 +00:00
Vania Januar
a425247076 Clarify that enabling Notes role requires reboot in preference summary 
Bug: 288387225
Change-Id: Id07e3b188442c6f4695b43d62b02ea8465d76a7e
Test: only a string change
 2023-06-22 10:12:30 +00:00
TreeHugger Robot
6377e84290 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 2461b42f22 -s ours am: b30f4fb6ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f7d0a2f2a4aed92da4c8248e71a5e999af82f7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 09:41:18 +00:00
Bill Yi
8fa10d8716 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: b9ebaae7af -s ours am: b6e9b3a532 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I643064a10167535712fce02a7975f15827217b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 09:41:02 +00:00
Bill Yi
f9d072155d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: a0c53d9c73 -s ours am: bf69a5d059 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a14cc5e18bca770c89a140c07769a2a706ac010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 09:40:47 +00:00
TreeHugger Robot
5e98af0a91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 1485ceaf97 -s ours am: 0e8155050c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6213824f2be3ae91dd9bba01f1cdf4368e239fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 09:39:42 +00:00
Bill Yi
b76c8a7dd1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: 422c0622e8 -s ours am: 8690fea740 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I172e36c3f08496c2d0f12011816e7c242b1b96dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 09:39:29 +00:00