Commit Graph

124755 Commits

Author SHA1 Message Date
Bill Yi
20dcd7f12d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours am: e08678a3fa -s ours am: 19fe0a3694 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7444b44c7cc84437f2245608d71aefee96c5c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 10:20:59 +00:00
Treehugger Robot
a1a5ae19b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a1c21ec6d0 -s ours am: e6b237fffe -s ours am: 985e90888c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I883dd7ab3b792bbce62050cb21f0377e8981d472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 10:18:23 +00:00
Bill Yi
ce2403c59b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aaf3c69d2 -s ours am: f7324a1365 -s ours am: 4be32233a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia973fc39b3ae315d1822acee005dfaf2850b8add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 10:18:19 +00:00
Treehugger Robot
1a7a0bcb83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a -s ours am: 295768313b -s ours am: e1f02bcd5c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26a5bbb1e02134293cf066f1159bcfa926a9a177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 10:18:18 +00:00
Bill Yi
a3e07855c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af0651b602 -s ours am: ace4cd9f14 -s ours am: 5beef0317f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I285ca0d7dd7720a9cd71c3ec49ae0b5931bb2f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 10:18:15 +00:00
Treehugger Robot
329822dfea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 987cc7259b -s ours am: 06daae87ea -s ours am: 95d104eb24 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic8070d63e38c900859dab46fb0b05725c05520e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 10:17:42 +00:00
Bill Yi
97ad2751a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours am: 75f8c5d4ef -s ours am: 9a7737a274 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic60b2a84156bd312e7eeb91f6dddff6bbc1088a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 10:17:20 +00:00
Bill Yi
19fe0a3694 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours am: e08678a3fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8b633811427027c2a137fa160bf5f6c0b762ebbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:37:21 +00:00
Treehugger Robot
985e90888c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a1c21ec6d0 -s ours am: e6b237fffe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5cc54293152e99921b4183448f5cef2f561f0338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:34:01 +00:00
Bill Yi
4be32233a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aaf3c69d2 -s ours am: f7324a1365 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46a2acd7af65efca87671756978c99d814de47e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:33:32 +00:00
Treehugger Robot
e1f02bcd5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a -s ours am: 295768313b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd8708c40154bd49c2756020f5cd81cc4933fba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:33:31 +00:00
Bill Yi
5beef0317f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af0651b602 -s ours am: ace4cd9f14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8bc42262a52dfdd2c2ef6ae089a53e58d5a5d52d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:32:55 +00:00
Treehugger Robot
95d104eb24 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 987cc7259b -s ours am: 06daae87ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c34a7b8add52807fe966a69b10df75317941e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:32:31 +00:00
Bill Yi
9a7737a274 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours am: 75f8c5d4ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c5b3359d24e4a775c2c6c2e7b4452d3c02bfe0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:31:53 +00:00
Bill Yi
e08678a3fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I693b38f4c4f289fe3d216b4e7d67b43fdc42ce0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:54:40 +00:00
Treehugger Robot
e6b237fffe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a1c21ec6d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1bc692d73d057033d1b4cdb416eb34bac1047ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:50:27 +00:00
Bill Yi
f7324a1365 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aaf3c69d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8be64b19a279edb0aa52b532b20d081c932dd47f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:50:11 +00:00
Treehugger Robot
295768313b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I5bf0721434528ffbb0ea0a93f16f5b6aa61234d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:50:02 +00:00
Treehugger Robot
06daae87ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 987cc7259b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I442c0552627cc95dff567f00023e9acd842b8a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:49:33 +00:00
Bill Yi
75f8c5d4ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0acbfd620aa09081d9bf0db20723d25c41fde33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:49:08 +00:00
TreeHugger Robot
ff5051e9f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 0f3ad0ceaf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I269ad34b66eaa06a713aca4727587367f3de5abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:26:01 +00:00
Treehugger Robot
a1c21ec6d0 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-29 07:57:31 +00:00
Treehugger Robot
7d651cba2a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-29 07:57:31 +00:00
Treehugger Robot
987cc7259b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-29 07:57:31 +00:00
TreeHugger Robot
5df6892b70 Merge changes from topic "tc_change_23042818_u_19"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a7c30fb20
  Import translations. DO NOT MERGE ANYWHERE
2023-04-29 07:49:27 +00:00
TreeHugger Robot
0f3ad0ceaf Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-04-29 07:49:27 +00:00
Treehugger Robot
dd7651a556 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f am: 9dccc78050 am: 6dbed93a01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: If9565578aadba7397b7d3288a84ab82c4a6be5b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 05:48:12 +00:00
Treehugger Robot
ec06213123 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: 4671972bea am: 0eb1227f1a am: 8066d50d08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: Ic549c0127ff188c3f6088c8f94093c9c6229a70f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 05:46:25 +00:00
Treehugger Robot
0a44b8659b Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f am: fabaacd2e6 am: 474ed89419
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: Iad055bd64fb23fa6d1311b95d39aa8d4503d38ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 05:42:22 +00:00
Treehugger Robot
6dbed93a01 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f am: 9dccc78050
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I54d5a5dae4c0adbd104f74b6405a1125f005640d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 05:22:41 +00:00
Treehugger Robot
8066d50d08 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: 4671972bea am: 0eb1227f1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I0f66992493412b7caaadba68e5fea25c3a1892a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 05:14:36 +00:00
Treehugger Robot
474ed89419 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f am: fabaacd2e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I21df140756c90aaaae4daaa017cf1f57bc694ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 05:13:21 +00:00
Treehugger Robot
0eb1227f1a Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: 4671972bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I0141cab3b834ca660b13cf7b606c7a62573ee1c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 04:42:01 +00:00
Treehugger Robot
9dccc78050 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I01654ba6548b73b357a39f4ed8cb015395fabf5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 04:40:54 +00:00
Treehugger Robot
fa4f628318 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: 7dfd217c1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I3b39848e791168df59d4f2203f59ae14728069df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 04:36:52 +00:00
Treehugger Robot
fabaacd2e6 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I07065ad6b618a9bbeac0d41d48eb5e8898a783d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 04:36:25 +00:00
Treehugger Robot
c1a32a5a7f Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I553d2a4be15286ec59f6fb38b188f4878c0e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 03:57:09 +00:00
Treehugger Robot
7dfd217c1e Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: Ie960d3dfa35598340a6394888f8d88d6f9d1303b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 03:56:58 +00:00
Treehugger Robot
4671972bea Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: Ica664646426196d5a88072594eb1a6d04b37ed97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 03:52:58 +00:00
Treehugger Robot
5b742dc320 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: e31a768cf5 am: cef37fe214 am: 9d63f7fe9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I4625b022b009d6ba4ffbd3720d9c97aaf4274dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 03:40:34 +00:00
Treehugger Robot
f21b66cd40 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: 76894e50f9 am: bb24cf231d am: 108a816399
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I014f4025306d62dae893c587f36d5e67eb710688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 03:39:42 +00:00
Treehugger Robot
9fa19adae9 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: e31a768cf5 am: 3be8f5f3a3 am: 0a9b57459d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I37ed24fa4dc22b607bcad17300a6ec1e3b24cb1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 03:38:17 +00:00
Treehugger Robot
24666c9737 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev 2023-04-29 03:21:56 +00:00
Treehugger Robot
9d63f7fe9f Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: e31a768cf5 am: cef37fe214
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I40efee420cb5426b71cf315468e59ee8ab724ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:57:14 +00:00
Treehugger Robot
108a816399 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: 76894e50f9 am: bb24cf231d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: Iec11feedaa3ebbcb61529730615552ae0507c7b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:53:08 +00:00
Treehugger Robot
0a9b57459d Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: e31a768cf5 am: 3be8f5f3a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I9ef54747cfc414e7d0b9c7ba2c8a8b48ded7e0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:52:08 +00:00
Treehugger Robot
2d5af103a7 Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 9a09103aaa am: 968de7c4a1 am: 380f70dd6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: Ie8fdc8e338cefaca2ff56006890beb9b53839eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:38:30 +00:00
Treehugger Robot
165689fd5a Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 550e33b9cd am: e25656bf3f am: 40f3fc08e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I32a33d4198e71717fba6be71ea08905e1f5350e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:26:56 +00:00
Treehugger Robot
d4975592ff Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 550e33b9cd am: 46895b026b am: 3b4cfe7403
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I5894ef65616916daa39ceca48caf8bbda9ffdde7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:21:58 +00:00