PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,597 Commits 1 Branch 0 Tags
40e82e3a47bccc964042a2fe6793625f94dba711
Commit Graph

126597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Cheng
40e82e3a47 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -s ours am: 2ee3088167 -s ours 
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

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

Change-Id: Ie148ac91f62cf55ff53e1c3df8b6b334997e2c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:46:35 +00:00
Grace Cheng
39f518b258 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: f73f073643 -s ours am: 60f4e180a2 -s ours 
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

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

Change-Id: I730dab9c7076a3abbae467fbb30b3d9cd0298f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:45:11 +00:00
Matías Hernández
f03e08c644 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 0d21526217 am: 63a50999f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: Ice022fe659e4a48ee5ae79c16f8b950479ad2b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:44:09 +00:00
Matías Hernández
bb3122ca29 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: 9feb898da7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I029027019505a86fbf88ad4a127d6f0ffa11ce79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 19:41:36 +00:00
Grace Cheng
2ee3088167 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -s ours 
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

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

Change-Id: I40e8eaf893dac682f8120213c32c28025fbbf29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:59:47 +00:00
Matías Hernández
281c4b631c Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: e20f52a05a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I2bcd0934af1e0e4d6679e04293f04bbebcadab4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:44:07 +00:00
Grace Cheng
60f4e180a2 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: f73f073643 -s ours 
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

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

Change-Id: I6581685284601d4ee82c4585a922092c17e12856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:41:14 +00:00
Grace Cheng
0dcfdacc25 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours 
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

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

Change-Id: Ie5120e61d7df71adf77970088a3be7334ed6a4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:40:12 +00:00
Matías Hernández
63a50999f5 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 0d21526217 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I66d6a9ce28f475dfb2d130bcaccdc3d2c6b8623d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:39:45 +00:00
Matías Hernández
e20f52a05a Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I8fc3a7b239ce0545b34eafc860df72a42cfd2e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:39:16 +00:00
Grace Cheng
f73f073643 Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I691796e372f65ffec44954a850d462f796c19f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:36:58 +00:00
Matías Hernández
9feb898da7 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I0f6901ca11f07090c15146dac2b0b39c67db8eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 18:35:52 +00:00
Grace Cheng
25b489e212 Merge "Fix NPE in updateAddPreference" into udc-dev 2023-06-28 17:41:13 +00:00
Matías Hernández
aaddfd88e9 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: If35fbb5c16a642b56de29012ce43ecd7f068d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 17:14:55 +00:00
Matías Hernández
0d21526217 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I1e1dbbdf2b1834da763835c1bbcd263cdb27eb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-28 17:10:34 +00:00
Matías Hernández
4d34eb2c7a Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev 2023-06-28 16:42:13 +00:00
Treehugger Robot
fac986e071 Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev am: 6b01e66545 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783056

Change-Id: I15eb02f35ba2bad14edd6ef00374216aa8b5b4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 18:07:37 +00:00
Treehugger Robot
6b01e66545 Merge "[Panlingual] Add metric in Languages" into udc-qpr-dev 2023-06-27 17:35:26 +00:00
Zoey Chen
dab8f53e9b [Panlingual] Add metric in Languages 
Bug: 279915462
Test: manual
Change-Id: I12dc7f8a0c594de88790e116c4b4f7ca9dc7253e
 2023-06-27 15:40:36 +00:00
Vania Januar
4c281ab191 Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev am: 0e8bdf2fc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23766165

Change-Id: I5937c756289f04916f366ec0acba6866b422ac50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 15:00:48 +00:00
Vania Januar
0e8bdf2fc0 Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev 2023-06-27 14:14:58 +00:00
Treehugger Robot
650a7e9298 Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev am: dd3e338823 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467970

Change-Id: If91f7efe15ef7fffda7a87ab6a8c188ab2a404be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 08:58:05 +00:00
Treehugger Robot
dd3e338823 Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev 2023-06-27 08:46:50 +00:00
Edgar Wang
88659e80d9 Correct used size of Storage Settings. am: e52320e755 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23483884

Change-Id: I4816569a8c5bee277121f15397adf7167ec944e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 08:35:31 +00:00
Xin Li
7a4625239f [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours am: 164acf327a -s ours am: bcc898dbed -s ours am: e849e3a643 -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: I190dc6e845ee9574e822ab9c357ed16282da8aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 07:27:29 +00:00
Xin Li
96633fda9a [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours am: e7ba843385 -s ours am: 8244a2aeb4 -s ours am: c9bfd995a9 -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: I2ddc767f85a91245866149964e541c4313f026f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 07:25:45 +00:00
Edgar Wang
e52320e755 Correct used size of Storage Settings. 
Since StorageManager rounded the totalBytes of device storage but
they don't do that rounding for freeBytes.
So in some cases the freeBytes can be greater than totalBytes.

We propose to get totalBytes of device storage directly to calculate
correct privateUsedBytes.

Test: robotest
Bug: 281955532
Change-Id: I4f137c20e7c2f54f4e037d50e81b3176edc1a83a
 2023-06-27 06:29:00 +00:00
TreeHugger Robot
f703764efd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 60f8d67f1d -s ours am: 48fa611907 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7083cb39af52fa39087d7735db2c7b3cd45cede5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:58:20 +00:00
Bill Yi
d6d923c325 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 6cb8b3b00c -s ours am: f44874ca83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56d347d8ef8a3076de90d6ab4c39c332b7d364a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:58:17 +00:00
Bill Yi
e8993b5116 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: 392e63d166 -s ours am: e4a787f1f0 -s ours am: dac919f41a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ecd960decf8b10f7505f7625bb24d4ca6745bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:57:14 +00:00
Hao Dong
ae04426d02 Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598" into udc-qpr-dev am: 0df79b1ccc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I364fb2e57fccd35f15a4adb61918ac2a8568ff9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:54:11 +00:00
Zoey Chen
c3bd5c2059 [Regional Preference] Add metric in Regional Preferences am: ca617d8612 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23817103

Change-Id: I8aa917c29aab30def405455d1465be64032335b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 05:52:46 +00:00
Hao Dong
0df79b1ccc Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598" into udc-qpr-dev 2023-06-27 05:37:33 +00:00
Zoey Chen
ca617d8612 [Regional Preference] Add metric in Regional Preferences 
Bug: 279918056
Test: manual
Change-Id: I71a16a96f2e647945b20cbfeee63d96b0f3a188f
 2023-06-27 05:16:28 +00:00
Xin Li
e849e3a643 [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours am: 164acf327a -s ours am: bcc898dbed -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: I2d0bd47af32ef241bc25755f8deedc5950716c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 01:15:56 +00:00
Xin Li
c9bfd995a9 [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours am: e7ba843385 -s ours am: 8244a2aeb4 -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: I823fb94c9e393c6f3de5538dd1330906d11f801b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 01:14:07 +00:00
Xin Li
bcc898dbed [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours am: 164acf327a -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: Idb89b852b5efc879a47552fdab0ca72a8169a756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 00:34:24 +00:00
Xin Li
8244a2aeb4 [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours am: e7ba843385 -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: I10491b313218cc917510d28164cf1758adbab070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-27 00:32:37 +00:00
Hao Dong
ed83c055df Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598 am: 93bcf8122c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I9fc884ce09f3858c53e7fe9fea2a664ac32f3e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:49:52 +00:00
Bill Yi
07c5c9d710 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 5f53b4c10e -s ours am: 5f846bb466 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a34153ae7b2389c7e84652ea6eb01a97680a604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:46:38 +00:00
Bill Yi
f795b00b5c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours am: e1dc1a0748 -s ours am: 587cddef51 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b62529b7e69220452eacc2014b9bf604d697afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:43:47 +00:00
TreeHugger Robot
48fa611907 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85a90ef00b -s ours am: 60f8d67f1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5603c0cf61378817b36a2d933667220f536ac32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:34:14 +00:00
Bill Yi
f44874ca83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374a3112e3 -s ours am: 6cb8b3b00c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30bda311566714246e07507b8c664dfba85c6066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:34:10 +00:00
Bill Yi
dac919f41a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: 392e63d166 -s ours am: e4a787f1f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e49ca184085c44061792d9fd8247b4193938b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:33:14 +00:00
Hao Dong
ae87a68cda Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I405d8bbbde142073214adbf663813f25667835fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:31:41 +00:00
Hao Dong
93bcf8122c Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I0b509bd402107442b93f6855f34389dfa61c59e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:26:53 +00:00
Xin Li
164acf327a [automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f -s ours am: c61819e807 -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: Id8b3ff644094f429231676ca4b4aa34a23ac4062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:12:11 +00:00
Xin Li
e7ba843385 [automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75 -s ours am: ba9cb49565 -s ours 
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf is already in history

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

Change-Id: I539ae150f02bd6b5d03249c043cefc8323a31dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:10:28 +00:00
Bill Yi
5f846bb466 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be -s ours am: aa006392a2 -s ours am: 5f53b4c10e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4f33decef8093aed197c68e69afbb34d0fe0976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:09:32 +00:00
Bill Yi
587cddef51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a -s ours am: a35176545a -s ours am: e1dc1a0748 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a7199c80bde4ac8e7710606bfd4fb84be0d6eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 23:02:07 +00:00