Bill Yi
eb9ec96b04
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c42f31df9d
am: 6f0694df62
-s ours am: 60193a79c7
-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: I998b116252558e45a2e803de005e30c6feffe873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:57:06 +00:00
Julia Reynolds
34ddea638a
Merge "Remove jank on DND schedule page" into udc-dev am: a0c9ce5b2f
am: cf46c546ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650757
Change-Id: I49fce7757974192e427da87d26d1492ba9663a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:32:40 +00:00
Bill Yi
867d51f97c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f6244e41d4
-s ours am: c8a792e18f
-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: Ia7ffa9b81492cb0efccb4a61e3e89e76fcc73321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:27:00 +00:00
Bill Yi
7a0e1fd843
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eb8b786fe
-s ours am: 85b5d74c9e
-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: Ia4172faa4a55ba416a6adae428feb57d1b7a4991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:26:52 +00:00
Bill Yi
4240063184
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b25ac20f23
-s ours am: 4d2f7b8349
-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: I5a2e51c944d0b6d9edd978b3c4b243d6b06238e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:26:27 +00:00
Bill Yi
b52704f36a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85eeec4806
-s ours am: ae87762751
-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: I1ca55ff99aaab12181bffdfcc79e51b0664a960c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 00:26:03 +00:00
Bill Yi
8ecd582217
[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: 3fa074e985
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: I8c9b7c5165e160783fdcc0d8ee1654c331df8dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:37:50 +00:00
Bill Yi
6bd263b740
[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: 70d60b8130
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ic8dfdcc32df927052dc3dc18a415c2acf014adb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:37:46 +00:00
Bill Yi
51010df8f0
[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: 97f2103ab2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I22ef889d644a265d095ec0aec7a0496bc6fa0e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:37:41 +00:00
Bill Yi
a9e83f5c94
[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: 1898979be7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I91c0396c7b02655bf9d53737780264e1db8eeac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:37:31 +00:00
Bill Yi
a8b1701b23
[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: c18b5b610a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I207b98de49407fc530aa432a78086d73ef68183c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:37:11 +00:00
Bill Yi
ab055002c5
[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: 4a6f525aa5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I7de7ac98fb750b7cd0664c8cb3c08ef3b622706b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:36:44 +00:00
Diya Bera
7fa342fadb
Removed subtext from side fps enrollment flow
...
Test: Manual (Try to enroll your fingerprint in a side fps device, and
observe that there is no subtext in landscape mode)
Bug: 267271891
Change-Id: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-01 23:17:27 +00:00
Hao Dong
9c1fb8d05f
Merge "Do not announce a11y move instructions in sensor area." into udc-dev am: b48c247ef9
am: 528bd9781e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617790
Change-Id: I7f740224bb449abb3447bed86a2dd5b7a871d868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:03:13 +00:00
Hao Dong
8ffff83d33
Merge "Do not announce a11y move instructions in sensor area." into udc-dev am: b48c247ef9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617790
Change-Id: Ic1a49e6e59b460caf11b828f38223933a5f13c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:57:12 +00:00
Menghan Li
80ba2f8f13
Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev am: bb5f8cef7d
am: 38c447dbd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649784
Change-Id: I7f54ea498be8392e3f4008da0a91c7e5f51c72d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:56:29 +00:00
Hao Dong
528bd9781e
Merge "Do not announce a11y move instructions in sensor area." into udc-dev am: b48c247ef9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617790
Change-Id: Ic0f432c7a66ba0bee641dde4cbf58a896857ec47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:54:45 +00:00
Joshua Mccloskey
591f3de8e7
Merge "Modified fingerprint enroll test" into udc-dev am: c75baeb774
am: 11bc7f02bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21676287
Change-Id: I484a6b023fb7723b49db211a8c4e7ed4836f4a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:54:26 +00:00
Hao Dong
b48c247ef9
Merge "Do not announce a11y move instructions in sensor area." into udc-dev
2023-03-01 22:53:23 +00:00
Menghan Li
38c447dbd9
Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev am: bb5f8cef7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649784
Change-Id: I1b45379004b946d9a5c45bb59ad6d75840e7f88a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:19:43 +00:00
Menghan Li
6429492245
Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev am: bb5f8cef7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649784
Change-Id: I8f69c3a434fb47bd3f641a1c6b9bee75892af5bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:19:29 +00:00
Joshua Mccloskey
11bc7f02bb
Merge "Modified fingerprint enroll test" into udc-dev am: c75baeb774
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21676287
Change-Id: I038f596beeeae897ddfea95cea5039c4925d3055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:17:52 +00:00
Joshua Mccloskey
2f503a8f18
Merge "Modified fingerprint enroll test" into udc-dev am: c75baeb774
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21676287
Change-Id: Ie781aeb811188e0df6b8a97845645f4d730a746c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 22:17:09 +00:00
Ahaan Ugale
74f924e048
Merge "Update Autofill OWNERS" am: e35606efd3
am: b238ee99cc
am: 96cb0fb4bd
am: 9cc184e3cb
am: 4520667b1e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: I26c4f5586f6f7cf061371cdc7796af1418044109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 21:53:15 +00:00
Bill Yi
e9bf573db5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13
-s ours am: 118faadcb1
-s ours am: f0b1e40b86
-s ours am: f5a9584cdc
-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: I2abbdb5833dbfda361b55cbcaebc7faaaca0d2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 21:49:08 +00:00
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
Menghan Li
bb5f8cef7d
Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev
2023-03-01 21:30:18 +00:00
Joshua Mccloskey
c75baeb774
Merge "Modified fingerprint enroll test" into udc-dev
2023-03-01 21:27:30 +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
Joshua McCloskey
187fe08143
Modified fingerprint enroll test
...
Test: m -j40 RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 271134136
Change-Id: Ic96407199a8394ac184a60229f371ee93838c926
2023-03-01 19:51:36 +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
9b83c59bf1
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: Ie24576f4fbcdebfc315e0047c0701f8506febe09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 19:42:41 +00:00
Bill Yi
60193a79c7
[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: If9a0395ed255b5864471653ad124c74290bb5b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 19:42:33 +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