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

133393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
869a35f0cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If67577e5d9f33fc84225bd53857e2e100c5f3221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:07:12 +00:00
Treehugger Robot
90e7cfacc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb7aed3a43239115c87473a745ca0d60723772e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:05:44 +00:00
Treehugger Robot
26579447e5 Merge "Update WhenToDreamPicker to unique page id" into udc-qpr-dev am: fd956769c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199981

Change-Id: Ica5220033baeda6812f4cbbe2f2ef442d0bd1645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:05:34 +00:00
Bill Yi
07b8d85c47 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id22c3fde7605bf488e141853e41586b1b3592720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:05:31 +00:00
Treehugger Robot
24998cae53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 3f7e055c28 -s ours am: 49df734359 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I927cabe9b8ea8875c2ef2eb2865a0adfb3285c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:00:06 +00:00
Bill Yi
188c3d0a4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: 159d0436eb -s ours am: aea12d4991 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d1efd898ed868a420c4994c5f931247acbcf45c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 17:59:56 +00:00
Treehugger Robot
72cabf57ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 3f7e055c28 -s ours am: b6e8ff6cb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb979a55e1422a69a2861ecead4b4a3d0e24ecdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 17:58:58 +00:00
Bill Yi
19a891ec03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: 159d0436eb -s ours am: 807e96ee52 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05133852ca6017d75669738c5eb04f480faf8772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 17:58:47 +00:00
Graciela Putri
1f1c2a7db9 Merge "[4/n] Add fullscreen option in user aspect ratio settings" into udc-qpr-dev 2023-07-28 13:15:52 +00:00
Graciela Putri
386b02e906 Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev 2023-07-28 13:14:03 +00:00
Treehugger Robot
a9a8c4ed19 Merge "Define the anomaly proto for anomaly detection project" into udc-qpr-dev 2023-07-28 11:25:39 +00:00
Graciela Wissen Putri
fa945cc808 [4/n] Add fullscreen option in user aspect ratio settings 
Apps > App Info > Advanced > Aspect ratio

Adds fullscreen option to aspect ratio settings gated by fullscreen
build time and runtime flags. If fullscreen option is disabled, return
app default option.

To enable feature:
adb shell device_config put window_manager
enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings

Bug: 291900454
Test: All Settings CUJs passed
      atest SettingsUnitTests:UserAspectRatioManagerTest
Change-Id: I8f8d0c08ac81f088d6c25e8dfb3550f807f336b6
 2023-07-28 10:09:56 +00:00
Graciela Wissen Putri
57984f02d5 [3/n] Add aspect ratio app info page 
Apps > App Info > Advanced > Aspect ratio

Adds link from aspect ratio app list page to app info. Stops activity if
user chooses a different aspect ratio override.

To enable feature:
adb shell device_config put window_manager enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings

Bug: 287448187
Test: Manual
      All Settings CUJs passed
      atest SettingsRoboTests:UserAspectRatioDetailsTest
      atest SettingsSpaUnitTests:UserAspectRatioAppPreferenceTest
Change-Id: Id47f291459e62267bf15d629c163dde73d96928a
 2023-07-28 09:53:11 +00:00
Zaiyue Xue
77bb2e1ce0 Define the anomaly proto for anomaly detection project 
Bug: 284893240
Test: presubmit
Change-Id: Ifecc0c952392c58f5c10147d37d3de21a05157b5
 2023-07-28 08:35:33 +00:00
YK Hung
1a4979753e Merge "Imple call method to detect settings anomaly(1/2)" into udc-qpr-dev 2023-07-28 06:43:13 +00:00
YK Hung
296322ad47 Merge "Fix inconsistent connected without charging state in the Settings" into udc-qpr-dev 2023-07-28 05:53:16 +00:00
Wesley Wang
456ca0177c Imple call method to detect settings anomaly(1/2) 
Bug: 290893324
Test: make SettingsRoboTests
Change-Id: I6c13f9cee29b723cbd9332fc5d84567be83699c3
 2023-07-28 12:32:39 +08:00
Treehugger Robot
98b806b999 Merge "Fix WifiScanWorkerTest tests failed" into main 2023-07-28 01:57:35 +00:00
Treehugger Robot
41d64c9bef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-07-28 00:54:10 +00:00
Treehugger Robot
cbe877892f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-07-28 00:53:34 +00:00
Treehugger Robot
fd956769c1 Merge "Update WhenToDreamPicker to unique page id" into udc-qpr-dev 2023-07-28 00:03:28 +00:00
Treehugger Robot
b6e8ff6cb7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 3f7e055c28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia222e1f8bb1887452d0f46f4c6264c32390fd4d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:22:52 +00:00
Bill Yi
807e96ee52 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: 159d0436eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85d73d99151065a46a1020cdb0a2c7082d3d5df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:22:47 +00:00
Treehugger Robot
0563fa9109 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 67c8ca53aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib76974c16dfc3ed66695c10b8f40b282bf175c63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:22:37 +00:00
Bill Yi
ca3a2026cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: c742ec92e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a8d5d35751378d10590c93b4631b0c9ab267c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:22:29 +00:00
Treehugger Robot
49df734359 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 3f7e055c28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c236fdcc87fd5d8337a6eec7e2293f22fbe33b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:22:01 +00:00
Bill Yi
aea12d4991 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: 159d0436eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I53c38375506ede99503599bac44953a1b705bde5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:21:53 +00:00
Treehugger Robot
82a260ccfc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 7ff127181c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I379fecd26b8581922bcf64e9f3bc29c5b5e59abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:01:59 +00:00
Bill Yi
ccc1927771 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: cc920c7dc0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I57c96d96373135ce7f3f7c71698dfc0a43fdbe9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:01:49 +00:00
Treehugger Robot
7ff127181c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idae707a4a76cb2cf4da7afe8fe8bf1c5b9e04fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:38:44 +00:00
Bill Yi
cc920c7dc0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12344d38d48baeabdbf19d0c2d7298ad2bef41d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:38:35 +00:00
Treehugger Robot
67c8ca53aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I58cbd237fadb933c2d6d365c9dc986f5a73622a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:38:20 +00:00
Bill Yi
c742ec92e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5dc9503de4bb4096e1fd2c3ac32a1d6b1c16e5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:38:14 +00:00
Treehugger Robot
3f7e055c28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6cc0b52a43f7b6f4d914abaeba0bc4f7f27ebf46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:34:16 +00:00
Bill Yi
159d0436eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I053e81d5f31f665c41249f2ff79b5e9d442364ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:34:04 +00:00
Treehugger Robot
84c2322af1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c986fa5e7ab0fdbacd0a0336b9245641e7648e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:49:38 +00:00
Bill Yi
fe5316f848 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b8424204dae662cd985ca5efdef8224b774675e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:49:26 +00:00
Treehugger Robot
5f66f4e0c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours am: fa17c9b44e -s ours am: fc2736173f -s ours am: fa7ecf3f01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59f586c974578c621a5ce72d39391001ee38175d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:48:27 +00:00
Bill Yi
b5bfe919d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 81a368ddf3 -s ours am: a8a67a3a13 -s ours am: f8df9954d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2bded52c3aeff59d248fb8aae5f361bb860cee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:48:20 +00:00
Treehugger Robot
a39e6e451f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours am: fa17c9b44e -s ours am: 950b464c49 -s ours am: a0b576c8a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I467fae054b8a43e203e0a36acdaaf00f92d0ed37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:46:58 +00:00
Bill Yi
8fcc04ba04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 81a368ddf3 -s ours am: a07ebaca0d -s ours am: d9d8253ebd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic31a97da0148049d1c5233fb0d7230a204232faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:46:49 +00:00
Treehugger Robot
fa7ecf3f01 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours am: fa17c9b44e -s ours am: fc2736173f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7da24a6c31e0cae4b5abf3142a0089ed75cdfb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:27:34 +00:00
Bill Yi
f8df9954d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 81a368ddf3 -s ours am: a8a67a3a13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a24ee3bff0a6a1182952170b38455268d46f777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:27:26 +00:00
Treehugger Robot
a0b576c8a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours am: fa17c9b44e -s ours am: 950b464c49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idea3284395813a0e109aa0cc95349fbf82dcf37b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:19:13 +00:00
Bill Yi
d9d8253ebd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 81a368ddf3 -s ours am: a07ebaca0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I595c9ee8203f5525103192bf554a3eca83ec3314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:19:05 +00:00
Treehugger Robot
bdb73ef28e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-07-27 21:07:50 +00:00
Treehugger Robot
b0600bda60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours am: fada6a22ca -s ours am: 1fcd56e84e -s ours am: 86bc070b7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I265393c189922cdeb9f25b0948b77842271b1d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:59:15 +00:00
Bill Yi
2fd14392d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 8ff46aae25 -s ours am: 9cf470ce3e -s ours am: a76da8f4d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iedb2f4165d56d827dde002fa67a6d5faa5599717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:59:08 +00:00
Treehugger Robot
e02c4bed28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 31f0efd2e7 -s ours am: 1c07e9b25d -s ours am: 98c4f16b1e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48d966218a93361ec2f9a556edb3d23f080c51df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:49:59 +00:00
Bill Yi
15e270013a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 557cad061e -s ours am: 53d77dee18 -s ours am: fc347793bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice39f54eca894e2f3269ede9d1a8707677a83e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:49:47 +00:00