PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,547 Commits 1 Branch 0 Tags
8864a2e4f47ce2a7b12d17ea66b8093d345f952c
Commit Graph

124547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankita Vyas
98e4d7bf16 Fetch summary only if feature is available 
onResume(loads summary) of controller seems to be invoked even when availabilty status
is unspported.

Bug: 278294334
Test: manual
Change-Id: I2486a7d61bea1b981ae56f0ff32b9d411be2ad14
 2023-05-15 13:31:38 +00:00
ykhung
29bc0d33d2 Disable the optimization mode preference if the app is not settable am: 5cd3a7298e am: 094281617f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: Ic22dabcfa9f9cb20bb8ec4c953be884a0b2c844b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 13:26:12 +00:00
ykhung
55ef64a3c8 Disable the optimization mode preference if the app is not settable am: 5cd3a7298e am: d056edc15c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: I2520f65c4290bbb113bca305e7f84eb0844e3da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 13:21:25 +00:00
ykhung
d056edc15c Disable the optimization mode preference if the app is not settable am: 5cd3a7298e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: I9d81ec00c5f5df7771f28f6bdc4775b7fdba987e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 12:43:08 +00:00
ykhung
094281617f Disable the optimization mode preference if the app is not settable am: 5cd3a7298e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: Ic7eb5e46f65c782b0f8922464a126f39c31dd3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 12:39:04 +00:00
ykhung
5cd3a7298e Disable the optimization mode preference if the app is not settable 
https://screenshot.googleplex.com/BbQyEv6YCjPVwUF (allowlist)
https://screenshot.googleplex.com/3hTb8TQwGMQqcwS
https://screenshot.googleplex.com/6hdTAT2yNFucD9N (system app)
https://screenshot.googleplex.com/77T5JyAD5nZJpDT (normal app)

Fix: 281566984
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: If7aa4b61bc806daa570187da24b7f454cd069dec
 2023-05-15 09:32:09 +00:00
Treehugger Robot
3fd07baf3c Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 43cbfa4229 am: 8b0483b0c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: Ib7c26af8cc1fc35efc1cdb15ad2db9743e89f51c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:31:33 +00:00
Treehugger Robot
6d7a8f32bd Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: 2150660ddc am: ff067bcce0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: I14d704925d8db31f17b2011960f10f7ab63b1ea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:30:36 +00:00
Treehugger Robot
324d646904 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 3263566899 am: 1e83ce4e35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: Icccf75eda15dc56641dce4eb27de05dc1efaae92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:29:50 +00:00
Treehugger Robot
25399ea2c1 Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: 14ebb061bc am: 9cb3635c45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: Ie0ceb1449afcf0223d4e0a3fed1fad105a61ec3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:29:07 +00:00
Treehugger Robot
8b0483b0c5 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 43cbfa4229 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: Ief693b107c0102bbacf1d6f89127e1aa116ec11f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:09:56 +00:00
Treehugger Robot
ff067bcce0 Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: 2150660ddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: I3cc19cbd68234046e2288d64e2f09ce12e700976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:09:16 +00:00
Treehugger Robot
1e83ce4e35 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 3263566899 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: I843e88f614fa1f78fe1dd27d48efda7cc83c54b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:53:54 +00:00
Treehugger Robot
9cb3635c45 Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: 14ebb061bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: I87f6c1ccb62fb8a36260c812ab59e71a39532c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:51:54 +00:00
Treehugger Robot
43cbfa4229 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: I2e2d3804816b994073f29ea90d3e5b64f7044eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:31:22 +00:00
Treehugger Robot
2150660ddc Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: Id149ac65a51676e1622a023ab3159ea2c0ecc731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:31:04 +00:00
Treehugger Robot
3263566899 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: I8fa4b811aa7799086468dc2a6abee1e4db444b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:27:13 +00:00
Treehugger Robot
14ebb061bc Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: If932fe3124f6ed49fc557a27e5ee4999cd41b941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:26:58 +00:00
Treehugger Robot
62193a6f56 Merge "work challenge: allow backgroud biometric auth" into udc-dev 2023-05-15 07:45:02 +00:00
Treehugger Robot
2b91f1a4cb Merge "Add allowlist mechanism for battery optimization mode" into udc-dev 2023-05-15 07:43:05 +00:00
Zoey Chen
0d1638c3d3 [Use] Replace settings LocalePreference with androidx LocalePreference 
Bug: 263861083
Test: atest and manual test
Change-Id: I7af48074278df0b12c83500f0d2b61eb279e70be
 2023-05-15 07:28:05 +00:00
ykhung
0cd24adec5 Add allowlist mechanism for battery optimization mode 
Add a mechanism to add package name into the allowlist to avoid users
change the battery optimization modes for specific apps in the list

https://screenshot.googleplex.com/8hrHCcTh5bNYXqp

Bug: 281566984
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: I8efa6a55646d761f5bee3667a59b38ab68c74bc1
 2023-05-15 14:28:49 +08:00
YK Hung
bf3ffd0ded Merge "Update battery health state intent (2/3)" into udc-dev am: 83de631175 am: 55a6b7cdc6 am: b14e8b6e0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222

Change-Id: I7a6bd632f963a2b329924ccdf9cb8d58215cdd72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 04:35:09 +00:00
YK Hung
fc2eed3625 Merge "Update battery health state intent (2/3)" into udc-dev am: 83de631175 am: a8830ef203 am: 0de27e8c3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222

Change-Id: Ibb51f594ed4006fb92378920bf6b37fd3127b495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 04:34:04 +00:00
YK Hung
b14e8b6e0b Merge "Update battery health state intent (2/3)" into udc-dev am: 83de631175 am: 55a6b7cdc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222

Change-Id: I438d03a849b14f291adc9d9d1c3e18a251203b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 04:03:33 +00:00
YK Hung
0de27e8c3e Merge "Update battery health state intent (2/3)" into udc-dev am: 83de631175 am: a8830ef203 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222

Change-Id: I81572a268d63cda5084ff2e3a031b4757d330cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 03:59:40 +00:00
YK Hung
55a6b7cdc6 Merge "Update battery health state intent (2/3)" into udc-dev am: 83de631175 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222

Change-Id: I94b81f612a8ce5852cffb34e1bbc70e6f5012610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 03:58:14 +00:00
YK Hung
a8830ef203 Merge "Update battery health state intent (2/3)" into udc-dev am: 83de631175 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222

Change-Id: Idc66a34c67b4ae570a6167c0704a25303a2629dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 03:42:48 +00:00
YK Hung
83de631175 Merge "Update battery health state intent (2/3)" into udc-dev 2023-05-15 03:27:44 +00:00
Milton Wu
abfb8a5e9d Fix FaceUpdater.enroll unit test fail in aosp 
Ignore related tests

Bug: 281627891
Test: atest FaceUpdaterTest
Change-Id: I028a7dd7fd2e56889ac27051678ca954c896da20
 2023-05-14 02:57:05 +00:00
Automerger Merge Worker
1d54095bd9 Merge changes from topic "am-71c27608aed14952b04fbb21f0150fbc" into udc-dev-plus-aosp am: 1251421e24 am: 1fec325e25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671

Change-Id: I7d87708204f6654c77a3784d291595c92b9b97b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:30:27 +00:00
Bill Yi
6877536f82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: b71dd78a86 -s ours am: b180bb350b -s ours am: 0fad648f74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I915785e82dc2385dabbbffff80dc17e11e797876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:30:14 +00:00
Bill Yi
9b1bc2eeae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: bc60e81eca -s ours am: 60ec0ad7d6 -s ours am: c50088a5b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7632a7d0c97f2eace5d51a8dd0bdcf8917514788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:29:12 +00:00
Bill Yi
26eca8a141 Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp am: a27aa2d884 am: 5c6f4e143f am: b7c7115afd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671

Change-Id: Ifb6447758f85aa28b44cdce10bcd76edf50ca485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:29:04 +00:00
Bill Yi
ae2b651ebd Merge changes from topic "tc_change_2305100725_44" into udc-dev-plus-aosp am: 325045641d am: 719673d6c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671

Change-Id: I204461769ed39fa26024bc3778587aac899ec9c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:25:28 +00:00
Bill Yi
51662269f0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb 2p: 7e3f3fd34d am: 4782cd97ab -s ours am: 0fb22d1d70 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7635b1ce29ff882e4246b3aba70a8b9b4cc15033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:25:15 +00:00
Automerger Merge Worker
1fec325e25 Merge changes from topic "am-71c27608aed14952b04fbb21f0150fbc" into udc-dev-plus-aosp am: 1251421e24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671

Change-Id: I2708231cacde46660695e194ccf38b145cc3b2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:08:34 +00:00
Bill Yi
0fad648f74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: b71dd78a86 -s ours am: b180bb350b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3898377680e7d28893cb97394f017f616442547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:08:10 +00:00
Bill Yi
c50088a5b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: bc60e81eca -s ours am: 60ec0ad7d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ab344e3a78d184f997f7e63f0f2b43051c7ba01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:04:41 +00:00
Bill Yi
b7c7115afd Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp am: a27aa2d884 am: 5c6f4e143f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671

Change-Id: I10d7aaf2f3ed89062ed3fcedf06eca43babcfa71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:04:32 +00:00
Bill Yi
719673d6c2 Merge changes from topic "tc_change_2305100725_44" into udc-dev-plus-aosp am: 325045641d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671

Change-Id: I665e1edb81e020c7a2260e5de4eb198ea9c51b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:59:33 +00:00
Bill Yi
0fb22d1d70 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb 2p: 7e3f3fd34d am: 4782cd97ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I859a9b80d7b64a66e3170f80d34928db27db8ae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:59:02 +00:00
Bill Yi
a3d289e6a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: b71dd78a86 -s ours am: cd8e1c9e26 -s ours am: 2e5bc64514 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67652e636e6e3ebccfa0e0f431c4473b3a718fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:47:09 +00:00
Bill Yi
5699fc92a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb -s ours am: 1f9dab1c8c -s ours am: 129296ea28 -s ours am: d074280871 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice4abaf9fcd86c5f41d66f65c5a29fc63771ee5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:46:57 +00:00
Bill Yi
ef4a3c8bce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: b71dd78a86 -s ours am: cd8e1c9e26 -s ours am: 033c9f300b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibde85051e7b99afb15ef77af17387489e5b6ba0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:39:03 +00:00
Bill Yi
51cd7d891d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb -s ours am: 1f9dab1c8c -s ours am: 129296ea28 -s ours am: f316e8121d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbef09b18be768af027c0c4a2f76a5dba5b4b82c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:38:53 +00:00
Bill Yi
033c9f300b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: b71dd78a86 -s ours am: cd8e1c9e26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94bd2f1f6f0f60a10d1c0f3e12367d59329c6885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:18:18 +00:00
Bill Yi
f316e8121d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb -s ours am: 1f9dab1c8c -s ours am: 129296ea28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48d1b67db29fe53c142d55f3751008743a02d3d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:18:06 +00:00
Bill Yi
2e5bc64514 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: b71dd78a86 -s ours am: cd8e1c9e26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I584d6617f644ff3ae2dd9a03df0ba0a06bc6baf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:06:44 +00:00
Bill Yi
d074280871 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb -s ours am: 1f9dab1c8c -s ours am: 129296ea28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17fc070e58e2fde9c569cee6cd1a36577e634ce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:06:32 +00:00