PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,798 Commits 1 Branch 0 Tags
f476c335f152c3732bfa93adb936b15a1be10e60
Commit Graph

120798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f476c335f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e722779e34 -s ours am: b710a96e76 -s ours am: d4f79a3237 -s ours am: 7beb35cb7f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f1d0fb13799f79ada7e4550d0e7e3605788c39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 21:48:51 +00:00
Vincent Wang
6bbbf36548 Merge "Fix Different layout between v2 enrolling and original enrolling page" into udc-dev am: 9c57255b39 am: e1386bba51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659502

Change-Id: I90acf79c6bc41239f37ee1cfd27e0d5dc006c2e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 21:26:26 +00:00
Andreas Miko
48660d4cca [automerger skipped] Merge "Add setting to disable PIN animation and password" into udc-dev am: 8b71dc930d am: 9d61cc28cc -s ours 
am skip reason: Merged-In I587b993ef5515a075442e82ebafae88bebdffc20 with SHA-1 387b788b19 is already in history

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

Change-Id: I1746fcd834f594540299c40f333ab07894992357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 21:26:07 +00:00
Chris Li
84833a7dbc Update EmbeddingAspectRatio to the latest am: 77a23c9ce2 am: 74f07a89bd am: 2bde9085dd am: ba3231c762 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647966

Change-Id: Ic567d96b50742ea6cf8ee9d46c495b533c278462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:59:47 +00:00
Will Leshner
3f96a28122 [automerger skipped] Restrict screen saver settings searches to enabled users. am: 3358e2a0a1 am: 554fe689fa -s ours am: 5a7e38ee6c -s ours am: c8c2cb0d6c -s ours 
am skip reason: Merged-In If2f465b2acb548455f0868507cf47217ea1a626f with SHA-1 ca1379f0b3 is already in history

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

Change-Id: Ifb2e5f3682e47ff6c89e1786f8b04221a9af7024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:59:35 +00:00
Natnael Belay
a67733510d Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp am: c6049dfa4e am: f89a6c2ed4 am: b50ad1c806 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21615990

Change-Id: I81fcc704f3e28010df336633ef680499cbfee521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:59:03 +00:00
Steve Elliott
6952037eae Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11 am: 97ee8a8414 am: f6955e43d7 am: 23cf83b75a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051

Change-Id: Idf12d00067e62eabb37680aefaac0fca901f727f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:58:50 +00:00
Automerger Merge Worker
92ccf5f9fd Merge "Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 am: d8f61dc2a3 am: 8ba70d32e2 am: 987f62322b" 2023-03-01 20:58:35 +00:00
Darrell Shi
ffa2edacfd Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 am: d8f61dc2a3 am: 8ba70d32e2 am: 987f62322b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841

Change-Id: Ie88ff6680c80e7b46f48f5725f32e8cb88d6b24d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:58:07 +00:00
Darrell Shi
914fb91162 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 am: d8f61dc2a3 am: 8ba70d32e2 am: 987f62322b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841

Change-Id: Ie35ca4fd90b17fecc6c3fa12a0f618f8d875652d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:57:57 +00:00
Vincent Wang
0f42bdb6b7 Merge "Fix UDFPS enrolling crash" into udc-dev am: 8e3c46b1c9 am: 2e3848a71f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617267

Change-Id: I0f66af85350d20ab352058df39ad5e4d1f91f4c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:30:51 +00:00
TreeHugger Robot
bc7dfd849f [automerger skipped] Merge "Disable MTE developer option if device config overrides it" into udc-dev am: c5054d5907 am: e16f187522 -s ours 
am skip reason: Merged-In Idd249e060a275b58a399349f202fc68b42964eb0 with SHA-1 9d99ab422a is already in history

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

Change-Id: I0d98ad53027090bb8d43b76b3592922a68d833f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:30:43 +00:00
Chaohui Wang
46094fd370 Merge "Fix App Info item summaries not refreshed" into udc-dev am: f74d6003ff am: a0b2938145 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647180

Change-Id: I2c4134f02144e666a617e95b7b975dd7ce1d7dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:30:34 +00:00
Bonian Chen
4eb1ba7721 Merge "[Settings] Improve logging to support issue triage" into udc-dev am: 6113725b61 am: 6a291f51fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649741

Change-Id: Icde87897dbec142267a0f147f3323f06149670f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 20:29:37 +00:00
Bill Yi
2e041c9723 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-01 19:59:34 +00:00
Bill Yi
dbb44f6df5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-01 19:59:34 +00:00
Bill Yi
5db8046438 Merge changes from topic "tc_change_23022712_26" into udc-dev am: cb44abff19 am: b6a93a192b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606457

Change-Id: I88c3ffb76de356db21bcea06b8e735c5f76ac734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:55:09 +00:00
Bill Yi
cb80520a5c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c42f31df9d am: 6f0694df62 -s ours am: f3086af940 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ac5d0726582ac552009d5c448a7c8b3cee744d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:55:04 +00:00
Julia Reynolds
ac3a758dba Merge "Remove jank on DND schedule page" into udc-dev am: a0c9ce5b2f am: f0bb4e8ce7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650757

Change-Id: I863c9046230f6f0b27d4bfe37d1d0cd61dce2cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:48:17 +00:00
Bill Yi
2da5709e97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f6244e41d4 -s ours am: 444be016ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55c79c7a567400438818a482485bbb268d823958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:42:16 +00:00
Bill Yi
c3ad6f050d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eb8b786fe -s ours am: e39eae202c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I093fc94b26a68ba0b90d7fd226dbb8b386674e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:41:51 +00:00
Bill Yi
18b54c93bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b25ac20f23 -s ours am: b546c56353 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e92e14ef05e11ba2529d4ee6be4e4607d1720c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:41:36 +00:00
Bill Yi
e3a4f68f6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85eeec4806 -s ours am: ebb5398309 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia99482b1d1fdc45b70dbc603e179eff725a3810f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:41:26 +00:00
Bill Yi
b6a93a192b Merge changes from topic "tc_change_23022712_26" into udc-dev am: cb44abff19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606457

Change-Id: I6f3f550b8eb8508537647ba82c50b5fab705bb84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:11:25 +00:00
Bill Yi
f3086af940 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c42f31df9d am: 6f0694df62 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8833359ae48495826b97628a588c7f94fb886e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:10:59 +00:00
Julia Reynolds
f0bb4e8ce7 Merge "Remove jank on DND schedule page" into udc-dev am: a0c9ce5b2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650757

Change-Id: If2c8d642016d0585dd66caf89e5d70a27ecd4e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:59:22 +00:00
Bill Yi
b6dd507a32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7ef6dedd46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4648c81a69a5aac58862a4afad43b2ad7dd82f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:52:27 +00:00
Bill Yi
c49b6a1709 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6cd183ace -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id99929a3bb07cf3a6681d837f5bce3c01587451b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:52:20 +00:00
Bill Yi
385875e1bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 4798986201 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6b883582a9046b0e4a6bb257b7c897aa2b63367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:52:09 +00:00
Bill Yi
34a52ef593 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2c986d8aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a02c4fcb46a4591e66d78afedf3ce0bef5a10fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:51:24 +00:00
Bill Yi
cb44abff19 Merge changes from topic "tc_change_23022712_26" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c42f31df9d
  Import translations. DO NOT MERGE ANYWHERE
 2023-03-01 18:47:31 +00:00
Bill Yi
444be016ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f6244e41d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic71a1a0bcb4a855a32974ce3130a7eb53f1c76d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:43:38 +00:00
Julia Reynolds
a0c9ce5b2f Merge "Remove jank on DND schedule page" into udc-dev 2023-03-01 18:43:11 +00:00
Bill Yi
e39eae202c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eb8b786fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1a758faebe9bca0f025db26015a873c9c5427e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:43:06 +00:00
Julia Reynolds
cb6a88b862 Remove jank on DND schedule page 
Only add/or remove preferences when absolutely needed.
Also fix a 'load data from backend' method that wasn't.

Fixes: 216747934
Test: ZenModeAutomaticRulesPreferenceControllerTest
Test: view schedules page
Test: add schedule
Test: remove schedule
Test: view schedule child page and return to schedules page
Change-Id: I237c2ca7ea89ee6e42354470a76712068a7f4dd7
 2023-03-01 18:43:02 +00:00
Bill Yi
b546c56353 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b25ac20f23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42b7fcbb27c07bd03fa97847b0065cb495f5f791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:41:59 +00:00
Bill Yi
ebb5398309 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85eeec4806 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf92cc2364fb7a81737accef498c100799b253bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:41:06 +00:00
Bill Yi
f6244e41d4 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-01 18:12:33 +00:00
Bill Yi
b25ac20f23 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-01 18:12:33 +00:00
Bill Yi
b4dec8df46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours am: ea2310e0fe -s ours am: 8ff2cfceab -s ours am: 1ae472af4d -s ours am: 8baecfab5c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie06abbe273cb33a98ff9a9b061cfd22c44f1b3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:05:51 +00:00
Bill Yi
e02849b450 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours am: 960eae9a2f -s ours am: cec67a1ee1 -s ours am: b3a751453e -s ours am: 2697dc29fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6da7e993c54e8bacf203dfe7bdcfc20e3cc3b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:05:49 +00:00
Bill Yi
581bcf009b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours am: 71ad7ad49e -s ours am: 3ba3148e2f -s ours am: 0d65b28b99 -s ours am: 5f755572b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e234071cb87935453ef4f3162ed9795ec974762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:05:48 +00:00
Bill Yi
468069d4dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours am: 9de8ff63dd -s ours am: 75304e1ff5 -s ours am: 4594e953c7 -s ours am: f8126117fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f6817bbf2e1a234991d90701d2ba2c65fa8977d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:05:47 +00:00
Bill Yi
976b58694f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours am: cac65afe79 -s ours am: 3d4d0267c6 -s ours am: a64f4a4585 -s ours am: b0cf8a0e4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b52b61282b4fb9a49d7e295252b37b3b84a012d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:05:46 +00:00
Bill Yi
2c34fd97dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad -s ours am: d3fa508918 -s ours am: 858813dc33 -s ours am: 27cafd0dfa -s ours am: c663a47b28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If87a4d916e5339234e8c017976831989c3cc567b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:04:28 +00:00
Ahaan Ugale
8d9121fd5b Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc am: 96cb0fb4bd am: 9cc184e3cb am: bd9a87a9a0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329

Change-Id: Ic043a46c13b58770b274a66044f375de02758bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:56:07 +00:00
Bill Yi
8baecfab5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours am: ea2310e0fe -s ours am: 8ff2cfceab -s ours am: 1ae472af4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99e48c5a1d6b0da7b741ee6ba82018c308814617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:50 +00:00
Bill Yi
2697dc29fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours am: 960eae9a2f -s ours am: cec67a1ee1 -s ours am: b3a751453e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f814077dbc5cbcf3a68fc19a003bf6d1120d597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:48 +00:00
Bill Yi
5f755572b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours am: 71ad7ad49e -s ours am: 3ba3148e2f -s ours am: 0d65b28b99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3bfa33a7c2ae8c26357f7d616104badfe370e9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:43 +00:00
Bill Yi
f8126117fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours am: 9de8ff63dd -s ours am: 75304e1ff5 -s ours am: 4594e953c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I909f40b5fa690beb258733eb0f71e63f3d19f0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:29 +00:00