PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,891 Commits 1 Branch 0 Tags
ae10f49ab832034952ce6c6bcc264765fd5b3c4c
Commit Graph

136891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mill Chen
6cbbc3bf3f Fix code inspection test for slice controllers 
Bug: 269156923
Test: atest CodeInspectionTest
Change-Id: I8937c8b3e39c475c630e8d4bbd45439c2234e7ea
 2023-10-03 08:23:36 +00:00
Treehugger Robot
094a73867c Merge "Fix missing declared accessibility PreferenceControllers." into main 2023-10-03 08:22:02 +00:00
Jason Chiu
45583d449f Enable the suggesiton test on disabled components 
The activity to test suggestions might be disabled by configuration. To
avoid no component found for testing, just query activities including
the disabled components.

Fix: 300160935
Test: atest SettingsRoboTests:com.android.settings.suggestions
Change-Id: I37718ea79480d16a90c67635666b8cdfa8be4dae
 2023-10-03 07:56:31 +00:00
Zoey Chen
6a3352e7a0 Merge "[ToA] Terms of Address UI, fragment in LocaleListPicker" into main 2023-10-03 07:46:49 +00:00
Wesley Wang
bace563189 Config battery info page(1/2) 
- Make battery information page configurable

Bug: 301817717
Test: make SettingsRoboTests
Change-Id: I51bf00fe3d9993ecd4e8481cd7c15d70b3c09ec4
 2023-10-03 07:36:52 +00:00
YK Hung
3be5135a01 Merge "Refactor Power Usage Time Page." into main 2023-10-03 06:55:07 +00:00
Zoey Chen
c2522b8f9d [ToA] Terms of Address UI, fragment in LocaleListPicker 
Test: atest TermsOfAddressCategoryControllerTest
Test: adb shell device_config put settings_globalintl com.android.settings.flags.terms_of_address_enabled true
Bug: 295826542
Bug: 297798866
Change-Id: I2b9af7cbe7cab0bb7b2168bc99f0fa7bc0903ac2
 2023-10-03 06:36:05 +00:00
Automerger Merge Worker
557344cfe6 Merge changes from topic "am-36bdf5682c8d45d1b2598533ab882f2d" into udc-qpr-dev-plus-aosp am: 3113c210d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570

Change-Id: I06f9ce714f9ed2f77defba20a417eea4b48866b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:49:04 +00:00
Bill Yi
4491694dd4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours am: bef7ad1471 -s ours am: 8f86536b38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa7d4455589adebba3fd0ab14e314bd06a0773e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:48:49 +00:00
Automerger Merge Worker
5760a58a59 Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into udc-d1-dev-plus-aosp am: ad59f779ed am: 2b1fcf52bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570

Change-Id: Idedc0d9dd43c05995ebf3265570aad222ad58f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:46:33 +00:00
Bill Yi
88174fc625 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours am: b3093ad1b7 -s ours am: 3958ffe934 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27ba6620f38fdeaed44e9494528faafd6162a832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:46:18 +00:00
Bill Yi
4ef9001b41 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: 3c00fdbe8e -s ours am: 27c5a172b5 -s ours am: 6c8c7465c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I111226d0c1c9a98ca983d940553f9b923480ef4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:39:59 +00:00
Bill Yi
a09672a68e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: fddbd76bd8 -s ours am: 11184d6acc -s ours am: fedfb4417d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb8c3125aa7e30c773550c9645e4f992d42b8fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:39:53 +00:00
Bill Yi
22d61264c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 8f824b54ea -s ours am: 8c0e6c44c0 -s ours am: 04b43abeb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc8a90add870c6759912ba80523e0202b6649d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:39:32 +00:00
Automerger Merge Worker
3113c210d6 Merge changes from topic "am-36bdf5682c8d45d1b2598533ab882f2d" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours am: bef7ad1471 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: cd61c38784 -s ours am: ccdb8bd50e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 6db59420a9 -s ours am: 72d054d599 -s ours
 2023-10-03 05:13:45 +00:00
Automerger Merge Worker
2b1fcf52bd Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into udc-d1-dev-plus-aosp am: ad59f779ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570

Change-Id: I84ca549bf4d828d0925120c61fb133f6fca58462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:12:34 +00:00
Bill Yi
3958ffe934 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours am: b3093ad1b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c024735d0888d5433b779de9dff534738adaf9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:12:18 +00:00
Bill Yi
8f86536b38 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours am: bef7ad1471 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4eaf7bf11f132fe16267f373d54fba13e3a7a6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:09:38 +00:00
Bill Yi
12e20e2727 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: cd61c38784 -s ours am: ccdb8bd50e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00abcd7eef3f6bbd2ea767afedfc28262c0e47f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:09:27 +00:00
Bill Yi
bd3be9a179 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 6db59420a9 -s ours am: 72d054d599 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I58fa08f584762b863023076adad1c4e025082c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:09:12 +00:00
Bill Yi
6c8c7465c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: 3c00fdbe8e -s ours am: 27c5a172b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iadf71ae24b753ca6583d2bd50038b81118a31366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:09:01 +00:00
Bill Yi
fedfb4417d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: fddbd76bd8 -s ours am: 11184d6acc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9b85a05c24451ccbcff9055907c99dab4966ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:08:49 +00:00
Bill Yi
04b43abeb4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 8f824b54ea -s ours am: 8c0e6c44c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f0813d02035f122dd064cbae62f1d2a19252d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:08:34 +00:00
Bill Yi
f060312e5b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I59f4f7a408f09877933e2f1e10ed17b0bb6c14f6
 2023-10-02 22:02:18 -07:00
Automerger Merge Worker
ad59f779ed Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into udc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: cd61c38784 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 6db59420a9 -s ours
 2023-10-03 04:39:59 +00:00
Bill Yi
bef7ad1471 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11004b020e71716c742f3fd5e402afe0c48e8f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:36:48 +00:00
Bill Yi
ccdb8bd50e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: cd61c38784 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9905a2e5b581a864ab1c9bcf19680ed291211b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:36:36 +00:00
Bill Yi
72d054d599 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 6db59420a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a849456c65a90a886af2e42522d7e4d94959d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:36:23 +00:00
Bill Yi
27c5a172b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: 3c00fdbe8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id83be08685aff164ffe578384d0127628dc0b984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:36:04 +00:00
Bill Yi
11184d6acc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: fddbd76bd8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ac16244743db5b39d988efcca249fc6a47c4e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:35:51 +00:00
Bill Yi
8c0e6c44c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 8f824b54ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86ab265f33bef673092c1c34df16eee78cee1807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:35:37 +00:00
Bill Yi
b3093ad1b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb4d66ae0308d7086de3163d30b68820fcc9b3cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:35:10 +00:00
Bill Yi
d85a9a5196 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: cd61c38784 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd495adf0006d0d3fdbfb446d26f8a70606c0e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:35:02 +00:00
Bill Yi
473073e421 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 6db59420a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I19e183bee4cf2d4c9bccd2312200182c1f7d1449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:34:44 +00:00
Bill Yi
93e55f37cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: 2a7ad51854 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I155479c1de21266c2dfeae6523d00b0272e454ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:19:17 +00:00
Bill Yi
1ed9caa084 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: b96f505024 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaaadb4415e7c33847e31ce446e6fcecd6c63cef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:19:09 +00:00
Bill Yi
7ed7f910cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 634343e027 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I360741872a48239c001b74f2a048df3597fec8db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:18:51 +00:00
Bill Yi
a42171c28d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I554524b0172d26550b6ad1af83a2e697df152a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:50:58 +00:00
Bill Yi
cd61c38784 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iecfb42a1621989212a935e1c954feb3d36f3e15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:50:49 +00:00
Bill Yi
2a7ad51854 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16adcd7307548edf047d3120c36d85010ea9165a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:50:39 +00:00
Bill Yi
6db59420a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id768812173c30a24ab6d5f94a5775ebf2180f711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:50:32 +00:00
Bill Yi
b96f505024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbfbb4d3b4b82114a20bf12de1f23d59c8de8e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:50:29 +00:00
Bill Yi
634343e027 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a28ccffab9a0dbe175f1cb47fb8683bbe852981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:50:13 +00:00
Bill Yi
3c00fdbe8e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I803cfed0e98c681d6b42fadb6a3ab5d077ddd531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:49:07 +00:00
Bill Yi
fddbd76bd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9ec59a7cac6f4e7cd51108f6d5bee2a5d47d1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:49:01 +00:00
Bill Yi
8f824b54ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fcb7e808a391d3aadda7a376ecdaa6e99dfd86b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:48:41 +00:00
Bill Yi
10a9e88148 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dd12cecf3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3f73a20013eb3c805d487afb2c85a2f9ede5eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:27:50 +00:00
Bill Yi
aa48a59290 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-10-03 03:12:03 +00:00
Bill Yi
9102470b11 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-10-03 03:12:03 +00:00
Bill Yi
7b38ca4ff1 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-10-03 03:09:01 +00:00