Commit Graph

126655 Commits

Author SHA1 Message Date
Treehugger Robot
17f7da8a55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7670083b52 -s ours am: 880a57f232 -s ours am: 76859a2f06 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28bf7ee2d69bd9b773bd6948ae5e5766add52c39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:32:26 +00:00
Treehugger Robot
ad5949f500 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7670083b52 -s ours am: 89e35d0961 -s ours am: dcc1ff6230 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I277032c4f62a256a065f787c0291fa97920e2cd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:30:13 +00:00
Bill Yi
d3c7d99138 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c1c35717 -s ours am: 6e8c9e284e -s ours am: e4f00cae5e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I513b97a33b32e3f5cf3480dd8897a1068c6a74c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:30:11 +00:00
Treehugger Robot
d794249999 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8eb849c4b2 -s ours am: b6d69d6e4c -s ours am: 421612bc97 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67c09222df6ce3477b58e5de2750d8f88fc02640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:30:09 +00:00
Bill Yi
8ba8bdf28c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 227df01c9b -s ours am: bd006fa2d0 -s ours am: 397bc085ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4475994e6c4573225b017c229f9684044210910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:29:50 +00:00
Treehugger Robot
1cb6019bae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 52978dea76 -s ours am: 8353438b42 -s ours am: f5e56b4992 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia085fa07d21bd97351c3f4bde7198d7af6b476c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:29:30 +00:00
Bill Yi
8d71f33a0e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6e1ce0079 -s ours am: ca44a41e48 -s ours am: ccc4b6a9cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iccde39733b716adace387b588a7de3a630c70255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:29:11 +00:00
Becca Hughes
d76726cc67 Merge "Show disable dialog box when none is selected" 2023-05-11 02:28:41 +00:00
Milton Wu
fb87abc49d Merge "Enable presubmit biometrics unit tests" 2023-05-11 02:09:35 +00:00
Treehugger Robot
37e6268ba4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 57efff9e30 -s ours am: 0ecddb0fe4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5fa1365927909d489a8c0c4cbb81ab2c034dcee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 01:40:44 +00:00
Bill Yi
53b5dca416 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b083926666 -s ours am: f4380c00f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib63388db42b1770e4f1e1f36d062f9f225c86272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 01:40:38 +00:00
Treehugger Robot
0e89479808 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 514fef7723 -s ours am: 81edb3054a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff2eb8cc8d85548b3248a7fce58cfc045d9f7ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 01:40:33 +00:00
Bill Yi
2bae84259f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54d9caa29c -s ours am: 296ee710fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I155d4d2772868e0da4bf30ee5040b83490f5809c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 01:40:12 +00:00
Treehugger Robot
7f09e5edc8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2c7395d101 -s ours am: d1193910d5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22cc5ffdd35e5ce877fd0bec7edf6217ee7deffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 01:39:54 +00:00
Bill Yi
50a30f3e80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a52301e2f5 -s ours am: f1f41abd8b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7954da89806a3739d758580adcbd1df1b261d2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 01:39:38 +00:00
Treehugger Robot
bb9689461f Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8 am: 636204bacd am: 217f6f75a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: I41d533326b66842bc90ea20134c5b104590c0981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 01:37:00 +00:00
Treehugger Robot
0b3b52274f Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6 am: 4dac429af9 am: 07a4951e7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: Ib4586f2aedf006ac199c58544b879e58ae0cd63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 01:36:51 +00:00
Treehugger Robot
d08dc7a663 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8 am: 50244c4f86 am: 804b4d6eb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: I1e2a92b7026912f14632b835af89d8a77cc51d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:58:37 +00:00
Treehugger Robot
43a86051e8 Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: b2b823f18e am: 5a44e6de08 am: e2a9d31903
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657

Change-Id: Ib0ebd57653207692a3d4fdf727afde924b28d8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:58:28 +00:00
Treehugger Robot
835cc892ea Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 84adeeac02 am: 22ecaf7c85 am: 8a2c0e7eb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: I1f1e563f175d2d30d0df8187b4a4dc474f489d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:58:19 +00:00
Treehugger Robot
ef525e8763 Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6 am: 02aba89873 am: d5a20542ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330

Change-Id: Ia5e2d91fefce7b07533e933c2abc658b8fbd510d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:58:10 +00:00
Treehugger Robot
db677df870 Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 28f09b6c46 am: 4f174a46a7 am: 132f4d3966
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I2997f420576b7916cfa711c1ac800df2d8d89f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:55:21 +00:00
Bill Yi
0e459427f3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: 7e9b0a8bc7 -s ours am: c9ce34190e -s ours am: 3b873d5add -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8f53ff93a7fa4f5a73a249f1e2d632bd0e3ca05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:55:13 +00:00
Treehugger Robot
89db703d11 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 9f55b55639 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I11c2ccc5fe96118e326e35adf208f2d4ccb01c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:48:28 +00:00
Bill Yi
b8ddbef086 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: c4697ef5bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8023dae1133c5fa698727967f8296a4043a186ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:48:25 +00:00
Treehugger Robot
e8744354db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: d03c1b75de -s ours
am skip reason: subject contains skip directive

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

Change-Id: If09b93be65113c1fcff613f07c706d7a0da9a17a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:48:23 +00:00
Bill Yi
f81bb062ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: d4b8fb52c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab1ad00db2e98b602f8d504f4270e6552316941b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:48:06 +00:00
Treehugger Robot
55d06f519a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 57c29e30d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5489cc8f4c7baf496d1f8ba246180afb3ac07814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:47:46 +00:00
Bill Yi
1da0fb35a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: 0e4e07c6e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6adf1f1611803783f27005469ee5b568134f5b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:47:25 +00:00
Becca Hughes
9272c0e3c8 Show disable dialog box when none is selected
Also remove from CMPP since that will be
hidden.

Test: ondevice
Bug: 281147573
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16d3b54aaf802c66be439bf65c877cba60c4390d)
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
2023-05-10 23:41:56 +00:00
Treehugger Robot
b1a9ba8a14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 1c9bf31044 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie72ec3f430219d477493d0e0a1c6fa92c9829d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:38:57 +00:00
Treehugger Robot
e7ff210f26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: bb298358c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4388dc786e27db25a8152226be592a5214e008f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:37:50 +00:00
Bill Yi
daa006af76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 606f49981b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e7d212d0f3bbd6ed6d635d26448ca1a4faaa96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:37:33 +00:00
Bill Yi
7b0fe10dd5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-10 23:28:46 +00:00
Bill Yi
94298e638f Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-10 23:28:46 +00:00
Bill Yi
deaa34f3f7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-10 23:28:46 +00:00
Treehugger Robot
76859a2f06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7670083b52 -s ours am: 880a57f232 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20e160a8597e20eaff1c80362283a300cbddfafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:24:07 +00:00
Bill Yi
5c4d96c9c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c1c35717 -s ours am: d1cf4e9b4f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d6baff04c8ded091cc21172bae4a5afba7bddcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:24:05 +00:00
Treehugger Robot
1e378e1505 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8eb849c4b2 -s ours am: e1420b8075 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic944201e59f83acfe9734a251eefcf82f8131a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:24:02 +00:00
Bill Yi
71473531c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 227df01c9b -s ours am: 1bdb0f81c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib031c91ea9553668acda2dee914a6d2e3f3f0c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:23:43 +00:00
Treehugger Robot
dcc1ff6230 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7670083b52 -s ours am: 89e35d0961 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d4b0cf9c4dcf7ab89fa909ecab302280798bddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:23:38 +00:00
Bill Yi
e4f00cae5e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c1c35717 -s ours am: 6e8c9e284e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f735334c8d0a4920b71b8460eff6efc82885008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:23:36 +00:00
Treehugger Robot
421612bc97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8eb849c4b2 -s ours am: b6d69d6e4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia98e134d1f4cbf9fe767fad410395507647f8f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:23:33 +00:00
Treehugger Robot
f178329070 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 52978dea76 -s ours am: acce6f0f69 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a6bcad9459538a03c48865c70ff3b38f964d71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:23:24 +00:00
Bill Yi
397bc085ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 227df01c9b -s ours am: bd006fa2d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I560864bcab6a5ad42ab9e2df292a9206d1413602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:23:14 +00:00
Bill Yi
84b9a9863c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6e1ce0079 -s ours am: f34ddf8255 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I24a2b39ab8ae27db3f11c9702f69ebecb0dc4bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:23:05 +00:00
Treehugger Robot
f5e56b4992 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 52978dea76 -s ours am: 8353438b42 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic00e7ea8c92a947c83458e7a0acf48ffd8e97c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:22:54 +00:00
Bill Yi
ccc4b6a9cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f6e1ce0079 -s ours am: ca44a41e48 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4101d276d36a0ab1aca8b471f28dad6c603d71fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:22:36 +00:00
Treehugger Robot
de23e4e00a Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 4fde620b4f am: b73b014d14 am: 570fa06b45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122

Change-Id: I5d29be0daff26cd69f8c5ec5a8c162779b0bc8c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:17:41 +00:00
Bill Yi
d27f3ed580 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: cd402bd739 -s ours am: ac2dc0940e -s ours am: 906fb93516 -s ours
am skip reason: subject contains skip directive

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

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