PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135,251 Commits 1 Branch 0 Tags
033c33e287f0681c48cd080fab144373edc1242c
Commit Graph

135251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
6e7b06f18e Clean up deprecated WifiSettings 
Replace all references to NetworkProviderSettings.

Bug: 297036035
Test: robo test
Test: manual - on internet settings
Change-Id: I2a5ae5644042c982c2a284a303257896c20b7714
 2023-09-01 13:24:29 +08:00
Chaohui Wang
ca4e47c348 Merge "Migrate WifiDialog2 to Kotlin" into main 2023-09-01 05:19:39 +00:00
Treehugger Robot
cde63d5ae2 Merge "[Regional preference] Add Regional Preference into the summary" into udc-qpr-dev am: c7ea783c78 am: f92766e74a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613092

Change-Id: I457ac375fe49a9eb16d232075056077c466920d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 04:07:50 +00:00
Aleksandr Lukin
fdf79d8e23 Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a am: 7aa48f70f1 am: 5e99db152b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: I05488b89dbd4f40b6c9eee8a8f9a6cda73dad4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 04:07:11 +00:00
Aleksandr Lukin
23064e1589 Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a am: 7888dfd518 am: 1d94371c6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: Ifc6e084ed97fdc196117256127ce7ccaeacfedb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 04:05:41 +00:00
Allen Su
ac54b70c85 Add feature flag for LocaleNotification 
Bug: 248514263
Test: atest AppLocalePickerActivityTest LocaleListEditorTest
Change-Id: I0e2160d75bbac83a161c73c90624b0e7af5b0a8e
 2023-09-01 03:24:58 +00:00
Chaohui Wang
b1ecd0e392 Migrate WifiDialog2 to Kotlin 
Bug: 297036035
Test: unit test
Test: manual - on wifi dialog
Change-Id: I5bcd636705b8514fe3fd784ef380f55e079c6ce7
 2023-09-01 11:15:14 +08:00
Priyanka Advani
7b4cfbca95 Merge "Revert "Remove Winscope tracing QS development tile"" into main 2023-09-01 03:14:34 +00:00
Treehugger Robot
f92766e74a Merge "[Regional preference] Add Regional Preference into the summary" into udc-qpr-dev am: c7ea783c78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613092

Change-Id: Ide98533ea70e94fad2a679d68936076dc85e1e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 03:13:03 +00:00
Aleksandr Lukin
5e99db152b Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a am: 7aa48f70f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: I4ae2ebe6541d606d164b66d3bac748c85eba5024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 03:11:25 +00:00
Zaiyue Xue
30141ada64 Fix b/298551473: Battery usage robotest failed in main branch 
Bug: 298551473
Fix: 298551473
Test: presubmit
Change-Id: I37a990003293bdfa0eb97e79c0ce7af2069d10bb
 2023-09-01 11:11:17 +08:00
Aleksandr Lukin
1d94371c6c Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a am: 7888dfd518 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: Ia83e8da0b6f425d92d7eca8d565819ade3c6fe21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 03:04:53 +00:00
Treehugger Robot
c7ea783c78 Merge "[Regional preference] Add Regional Preference into the summary" into udc-qpr-dev 2023-09-01 02:29:00 +00:00
Aleksandr Lukin
7888dfd518 Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: I92f3ad3e76029f5f0f2caff4e5016a2475decaf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 02:27:28 +00:00
Aleksandr Lukin
7aa48f70f1 Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: I816aff6dab9ac5f3ef72f0f110087650125797bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 02:18:08 +00:00
Aleksandr Lukin
d1373d4a1a Merge "Update the API usage to get total size of devices" into udc-d1-dev 2023-09-01 01:41:27 +00:00
Vlad Popa
2df0b3bf6f [automerger skipped] Merge "Disable the spatializer options for device categories" into udc-qpr-dev am: 4010b222f8 am: 4ee43c40e9 -s ours 
am skip reason: Merged-In I7f044d40afadec6ccf659ae4969c0d6e2dc8c79e with SHA-1 92fb7bddbf is already in history

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

Change-Id: I632593e4b0e8c730f590282d5cb951001b843448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 00:55:14 +00:00
Vlad Popa
4ee43c40e9 Merge "Disable the spatializer options for device categories" into udc-qpr-dev am: 4010b222f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24531690

Change-Id: I134714c9a5cb03c06d6dbee2256d7630554c37c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 00:44:41 +00:00
Diwas Sharma
e08ceb575c Revert "Remove Winscope tracing QS development tile" 
This reverts commit 513e014963.

Reason for revert: 298512106

Change-Id: I5efa947b17b8d33cfe8ca3350c2279903e5239af
 2023-09-01 00:41:22 +00:00
Vlad Popa
4010b222f8 Merge "Disable the spatializer options for device categories" into udc-qpr-dev 2023-09-01 00:33:47 +00:00
Automerger Merge Worker
bf371c9abe Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp am: 7ca1b2fec0 am: 675d84de56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441

Change-Id: Ie7723b14d29b2357d384d9ac7828bc760278f2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:15:40 +00:00
Bill Yi
7826c84f0c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: 14b51e0e37 -s ours am: 8dd6eb5801 -s ours am: 4f80e2f41b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1baddfca7fe2314ac339e3d00fd107d72d29e10f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:15:26 +00:00
Automerger Merge Worker
6ee222f59e Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into udc-d1-dev-plus-aosp am: 80cc76eda4 am: c809a3a9f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441

Change-Id: Ic9ab88fcc35b090160563f5ac3600ea56195d078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:09:24 +00:00
Bill Yi
bb508ed01b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: f3392e54a5 -s ours am: 56d5a70aa0 -s ours am: 6c43cdc8fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id88118b995912edd9d46025ee76ea3a8248a004e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:09:12 +00:00
Bill Yi
28d492ee43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce -s ours am: d1616c60a3 -s ours am: a63c9b0a73 -s ours am: af119807cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f94c7f641de2efb2347e22f0fafb77b11a40a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:07:55 +00:00
Bill Yi
8e811d4eca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe -s ours am: eaa92efd07 -s ours am: 0cc3b9a425 -s ours am: 410d0c42d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie264fac347b6f17e0b799dcc93ec4886a8573a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:07:49 +00:00
Bill Yi
3ef382b381 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d3e67b615d -s ours am: 14442ba7c3 -s ours am: ef8d4e5e6b -s ours am: 699d23a505 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ea7c61d3775c79c5bd6900603a3bf0b9a8e05b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:07:45 +00:00
Bill Yi
30f0f5bbc4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a5e445593 -s ours am: 9725cfd44b -s ours am: 42d9975494 -s ours am: 60a51495f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1d6ecbffe836807f95b0c228558c2a97b0e5a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:07:34 +00:00
Bill Yi
f8fc54e471 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f8a434c4d -s ours am: 34d81dca78 -s ours am: 0b92155672 -s ours am: edaf97d7bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49c680f1e6a73202eb5fb01a95ffdbd9f9350796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:07:12 +00:00
Automerger Merge Worker
675d84de56 Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp am: 7ca1b2fec0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441

Change-Id: I523255e92ee3739ea6ec8f942a8dd2b9bbaf678e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:21:49 +00:00
Bill Yi
4f80e2f41b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: 14b51e0e37 -s ours am: 8dd6eb5801 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e7dc7ce9e0ce46cf80ad356bc42954adb37b6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:21:36 +00:00
Automerger Merge Worker
c809a3a9f4 Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into udc-d1-dev-plus-aosp am: 80cc76eda4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441

Change-Id: Ic55574efe6bf14e3c66a782c2371e8409c690fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:09:22 +00:00
Bill Yi
6c43cdc8fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: f3392e54a5 -s ours am: 56d5a70aa0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76e6e683c0e0728c2538daba228e96a96a08dc91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:09:09 +00:00
Bill Yi
af119807cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce -s ours am: d1616c60a3 -s ours am: a63c9b0a73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If025e0ab4b426dc312ab9108be4a49d319097062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:07:37 +00:00
Bill Yi
410d0c42d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe -s ours am: eaa92efd07 -s ours am: 0cc3b9a425 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02fe4128dabbc495a7524352ee3c3c78f9859572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:07:33 +00:00
Bill Yi
699d23a505 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d3e67b615d -s ours am: 14442ba7c3 -s ours am: ef8d4e5e6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9bd4907a68b19420f12f137460523e744e5d2de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:07:28 +00:00
Bill Yi
60a51495f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a5e445593 -s ours am: 9725cfd44b -s ours am: 42d9975494 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I309cf8b2f70fee23ec208cbe288daf58f67fc0b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:07:18 +00:00
Bill Yi
edaf97d7bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f8a434c4d -s ours am: 34d81dca78 -s ours am: 0b92155672 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9f0a4427444c150748d4b3b64d6fe93867cb306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 22:06:55 +00:00
Kean Mariotti
698657dead Merge "Remove Winscope tracing QS development tile" into main 2023-08-31 22:06:52 +00:00
Automerger Merge Worker
7ca1b2fec0 Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp 
* changes:
  Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp am: 6f807ebf11
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: 14b51e0e37 -s ours
 2023-08-31 21:33:31 +00:00
Bill Yi
0faa98447b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: f3392e54a5 -s ours am: fbdc7a966b -s ours am: 0e9389c055 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic98419e343f5e77018196a5846b6cb822cd6781c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:32:23 +00:00
Bill Yi
1a59b9b606 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1 -s ours am: 27207b8ba2 -s ours am: c3cef770f3 -s ours am: 012fedfa7a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I70a9922a0d2cfd545bd1d1346ab3e00f61bcdc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:32:19 +00:00
Bill Yi
51936fe5bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957 -s ours am: 055f0b6e04 -s ours am: e963959f7d -s ours am: f7450d66d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e76f1ef35f8e169d7ad7edd19679776fffc19c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:32:15 +00:00
Bill Yi
6c61285266 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441 -s ours am: 108e964377 -s ours am: 38089bf012 -s ours am: edf781add5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2410097844a6f0b557d870c176e3a040738c43e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:32:05 +00:00
Bill Yi
3cd1e56596 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours am: 9638eb7317 -s ours am: afddd403e6 -s ours am: 9d08b557f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66386a7032a4a82cf8eef433c5779f9f19381b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:31:52 +00:00
Automerger Merge Worker
3a3f389903 Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp am: 6f807ebf11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441

Change-Id: I5e825c033beff24dfbc3f2927a0bbf51cc8e52bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:31:28 +00:00
Automerger Merge Worker
80cc76eda4 Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into udc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: f3392e54a5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1 -s ours am: 27207b8ba2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957 -s ours am: 055f0b6e04 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441 -s ours am: 108e964377 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours am: 9638eb7317 -s ours
 2023-08-31 21:31:17 +00:00
Bill Yi
8dd6eb5801 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: 14b51e0e37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec7a0341be26f883a8abae2e8c3f44828ee08325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:31:14 +00:00
Bill Yi
a63c9b0a73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce -s ours am: d1616c60a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfeadb7c29852872008f7954ee90ef2a34d84adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:28:47 +00:00
Bill Yi
0cc3b9a425 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe -s ours am: eaa92efd07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie22e8090f7e5ecc55918cfe95105620015f7eb0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:28:44 +00:00