PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,951 Commits 1 Branch 0 Tags
eeae540d6cd6124edfe24afa44eb0e8ad6574c0c
Commit Graph

128951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f62d644af8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: d2bd70c172 -s ours am: 0388f986a9 -s ours am: 29a29b1115 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03114b6ca100c544dca937bfc75a4a7fccbf8a83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:05:58 +00:00
Bill Yi
917b0106b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: e379726b51 -s ours am: 2ccfd19de9 -s ours am: 15a9320fda -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9fbf260dbf7cf453e6c1698af04e8cdda34d6f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:01:40 +00:00
Bill Yi
b431d9fa28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 1187b059e5 -s ours am: 2b3db795c2 -s ours am: cf55a34b9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I58d884d714dc2c9f75c4e870ac1f7909ba9c1225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:01:16 +00:00
Bill Yi
50bf07876e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: 1288b1b851 -s ours am: 110d4e79b6 -s ours am: e4f0727aa6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If365045bdcf0d59265a03d982f3dc4d4c62b3391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:59:41 +00:00
Bill Yi
0e04ef4b24 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-24 18:47:59 +00:00
Bill Yi
b88b9437ed Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-24 18:47:59 +00:00
Bill Yi
61f0f3cd49 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-24 18:47:59 +00:00
Bill Yi
7aaca6b057 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: d2bd70c172 -s ours am: dda3891316 -s ours am: 5edb31bd42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7821e93604eec484f27ddbb8e861c5f99baf98a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:44:35 +00:00
Bill Yi
f3c68e300f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -s ours am: ae5e86f283 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I019a9c893af8214bcbd337e4975800aadca1f546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:02:24 +00:00
Bill Yi
4e2592b4f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -s ours am: 2affec9bb9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic76a84fc81b349dd236cd6b9ec29dbaa21b4b06a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:02:22 +00:00
Bill Yi
2041b90637 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -s ours am: f8bc9d8d44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib842aee6375c8376030d3d2a584b4c6607bf665f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:02:16 +00:00
Bill Yi
63b9f34873 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -s ours am: 85cad646c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71f4213180df8b13fa3edbd459f2cd82540b9c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:01:48 +00:00
Bill Yi
1fda5b526f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -s ours am: 8fd4e1cc3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6aaa8d706a1d3593acd0f95cd9631101d343a3a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:01:21 +00:00
Bill Yi
77be6c4eea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -s ours am: 7af5bff35e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ce354e6d654ee5f6f5cd78a4f2c8a5c84d6a55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 18:00:59 +00:00
Bill Yi
378937dd4b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -s ours am: 57f926c95d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18986dc3ec1ee5f4245bc59428490994a7dfcc01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:56:40 +00:00
Bill Yi
f96b2f4688 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -s ours am: b531e765fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3eb07a2706cf837f344d21659daaac419065d6af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:56:37 +00:00
Bill Yi
9d96de691b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -s ours am: 9ed3697c68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I907e0ac5cc78c5a1d589e2be47ed20677f3edce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:56:31 +00:00
Bill Yi
6520274437 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -s ours am: bc52047a0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39a0adf6cc90fea2204c1735dc4a3f160e6d5fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:56:02 +00:00
Bill Yi
4a00be5d4b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -s ours am: d54daa1c26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f9110e01971fabe18cff2dd0a2b836036161e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:55:36 +00:00
Bill Yi
7c529a17f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -s ours am: d9d4ed48e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I296f350fe6381f636293d64a77e7863a488b569a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:55:14 +00:00
Bill Yi
ae5e86f283 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I004622940f7cd703d8a300e5445478c33023c3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:39:24 +00:00
Bill Yi
2affec9bb9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5c641f24bace7be5df568522e143cee790cdad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:39:18 +00:00
Bill Yi
f8bc9d8d44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b71c76b8ddaa27509076c335f3551440617cbe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:39:14 +00:00
Bill Yi
85cad646c1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb4872706fa2cb3f5e5560cc202eeb1a8b82c7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:38:40 +00:00
Bill Yi
8fd4e1cc3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d0f764b1d8447d6b39e1f5d9c0b6bd08dd42458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:38:17 +00:00
Bill Yi
7af5bff35e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74dff6cfaf6c162c1c7fa32636b23b5d74428da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:37:58 +00:00
Bill Yi
57f926c95d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e59db548a7277241a9ccaec754033b90cf954cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:36:00 +00:00
Bill Yi
b531e765fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36cb7805f09e36dd5faeef7c0def750a198a1428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:35:58 +00:00
Bill Yi
9ed3697c68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I8dddffd8855e1ddd235305cb8153054fe388475f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:35:16 +00:00
Bill Yi
d54daa1c26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5815e44184fc69caea51ebbe8944af8b4990fb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:34:53 +00:00
Bill Yi
d9d4ed48e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I899acc4c367de63c7d2cdc0b38c9ee17c4d22c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:34:34 +00:00
Diya Bera
71dd391e4d Fingerprint Error Dialog 
Add "Try Again" for UNABLE_TO_PROCESS error. Change default title
string. Custom strings for Settings and Setup.

Bug: 280786940
Test: Try to enroll fingerprint, trigger a corresponding error and check
the error dialog

Change-Id: I5975d169e1d33cff87f58fb8882261bb1bd3520e
 2023-05-24 10:15:52 -07:00
Bill Yi
dc4c6cf07c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-24 17:14:01 +00:00
Bill Yi
5ee6cbb95c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-24 17:14:01 +00:00
Bill Yi
62106c3d13 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-24 17:14:01 +00:00
Bill Yi
156beaa5b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: e379726b51 -s ours am: 6b6386163e -s ours am: e54a0e6a62 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7c6597934a4235f0237e5d65038189fd2cb52f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:13:54 +00:00
Bill Yi
2d07ac7638 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 1187b059e5 -s ours am: a7016867de -s ours am: 3f6346370d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79be10f9b5a5378aab16627fb3496efdb3b9e7b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:13:31 +00:00
Bill Yi
20ed0ab26a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: 5a18114757 -s ours am: 8ea4882c07 -s ours am: b84c9d2576 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74704ed6222ab5146a0967270277e02b44f04f92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:11:51 +00:00
Bill Yi
83356620e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 45604d8938 -s ours am: e6a8da6540 -s ours am: b8a491486e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff4039f8f671952ef1d4dee6d5c8d4e7c69b5878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:11:29 +00:00
Bill Yi
a32be9202d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: fa94aa39eb -s ours am: 84540eb406 -s ours am: 31ae0474ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06b199b5075289ce41aafcae3c20edc57c43597c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:09:51 +00:00
Bill Yi
afbb66ca71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 7e4689c960 -s ours am: da3133ac63 -s ours am: 56dc6413be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f797b9312cef0d3a67821901c88dd90bc1034d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:09:49 +00:00
Bill Yi
62e94da726 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: c5bca3f94f -s ours am: ad0d23056a -s ours am: 797fc344f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I021ba3beebc1c518b1c84287a8cca89849da7e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:09:42 +00:00
Bill Yi
5def13f041 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: dc957a0cae -s ours am: 7c4360c9dc -s ours am: 88cdc5a2d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f6897f2b909e84fd6b6a3e68dc0f0bf183e55b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:09:17 +00:00
Bill Yi
1ebabbb9e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 2833f69afa -s ours am: ae1eb664b7 -s ours am: e82ceae8a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea7945136ff49aadae7441ec8eec7c1fb02e989f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:08:54 +00:00
Bill Yi
709a9b9770 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: 59aaf2dd32 -s ours am: 98d36bda87 -s ours am: ecdf2f198e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie57719bff8d172da71876b38f1c0fb9c704658fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:08:35 +00:00
Bill Yi
7beacaa47a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: 425f03d8c2 -s ours am: 49158d6ab2 -s ours am: 6c96711315 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3b164204c031d42783f4f850e3dbe1239e76d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:07:09 +00:00
Bill Yi
94696fc55c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 0ff2acd74e -s ours am: 8704f31c3e -s ours am: b8333888c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdd7f805a66bde72fe9c203e2f88be9d27661c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:07:05 +00:00
Bill Yi
2576925a81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: 851cd09273 -s ours am: b5f465a035 -s ours am: a71ca08160 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46d7f4e452f8fa88a2e1b51c777402b478ba48d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:07:00 +00:00
Bill Yi
ac92609cfd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: 90323d459e -s ours am: 5a8bc21cf6 -s ours am: d9c3cd288d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I218e9e8439e181924691321fbf55bd1ba20a9da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 17:06:35 +00:00