Commit Graph

125359 Commits

Author SHA1 Message Date
Bill Yi
7be9aaeab6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c -s ours am: 77e56766c3 -s ours am: 81a9f0e818 -s ours am: 7922024c20 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4194ba8e99dcd16caf826cff7e2db788dd15d98a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:52:34 +00:00
Lin Yuan
320fd0eccf [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 am: ec574d6fe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ia48444200c199ab7e64e7f1a25c7d679fbc8265c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:13:04 +00:00
Lin Yuan
ebbc27605a [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 am: 5a099fab45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I576cdbb2a305313758ca006624f56142ea0a0648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:11:51 +00:00
Automerger Merge Worker
f1f255e34c Merge changes from topic "am-8cb85c2d51a348c580a82e26ddd8d05c"
* changes:
  Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62 am: 61f1af73e6 am: 9cdbbc334e am: 47e542d48a
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours am: 44d28ab6f5 -s ours am: cc1284d1e2 -s ours am: 9b1094e52a -s ours
2023-05-04 03:04:46 +00:00
TreeHugger Robot
e397be9f9e Merge "Change MonitoringCertInfoActivity exported flag to be false." 2023-05-04 03:04:41 +00:00
TreeHugger Robot
5081cc5afe Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62 am: 61f1af73e6 am: 9cdbbc334e am: 47e542d48a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410

Change-Id: Ifcf4982914dfdf689c49388ae0523d8977c92429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:04:38 +00:00
Bill Yi
7d86d1f8f5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours am: 44d28ab6f5 -s ours am: cc1284d1e2 -s ours am: 9b1094e52a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d0c1405d362b5c59eee0a3f4ae730f0ac0ce7b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:04:32 +00:00
Treehugger Robot
c81723c9e2 Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586 am: 48f8eecbd1 am: 089c61b6ae am: 8df2ac3f94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411

Change-Id: I40bc0fb0e4d8e1cb4ab8a55adfd08620aac574ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:03:58 +00:00
Bill Yi
77846213de [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f am: aa9489179b -s ours am: 20a33c9bdd -s ours am: ca3c627645 -s ours am: 3e9797b743 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I44d640e56e17d232083bbb18e65fd3537964469d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:03:54 +00:00
Treehugger Robot
9504455518 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033 -s ours am: f84817da57 -s ours am: 989436c29a -s ours am: 3cfa15c482 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If0ec85e38927d6fd2eff40cceecfe08a63d50e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:03:09 +00:00
Bill Yi
5b4853777e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683 -s ours am: cf281ffe95 -s ours am: c8907529e0 -s ours am: 9733ac707a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib8ffefc87c99d5600b5bfdea95104ce45f7867b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:03:06 +00:00
Treehugger Robot
eacbf4e388 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9 -s ours am: 71f2e23696 -s ours am: 8cf712a373 -s ours am: 21d4e58d35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0a390f5f8bd2724be7466270814826ce2f3cda9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:02:26 +00:00
Bill Yi
8ff23e6a83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c -s ours am: c2df5abd3c -s ours am: 7bfa543a7d -s ours am: cc4d07a9fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib9f49e4dd14596c40b0e5beb0792ad65e699ee9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:02:12 +00:00
Lin Yuan
ec574d6fe5 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ifc9575413c7025833b2e95de281f16f7b8197537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:29:36 +00:00
Lin Yuan
5a099fab45 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I0b8452b48f8581b117580dfbf92de545aba578e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:28:46 +00:00
Bill Yi
1eccbee153 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c -s ours am: 8b08d034f0 -s ours am: c4204c0ef5 -s ours am: 537989bfa6 -s ours am: b3ebd4610a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I289a0965e0666942372c071c3e7212411ad90126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:27:00 +00:00
Treehugger Robot
ecbbb9092f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d -s ours am: 4195ac4a28 -s ours am: 38ea3da507 -s ours am: 6cd538d7f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2e61abc4917b5c232f9149b0fbd1cdf0bc1829f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:26:10 +00:00
Bill Yi
7fdb7e7412 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b -s ours am: 56cb3df78d -s ours am: b4ab4fd7f6 -s ours am: 3ae0aaafe7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I27f53ac078d96f50f63308bf2b801d32637fc67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:26:05 +00:00
Lin Yuan
dac4ef66d9 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ia36438aa214a976c0b98eeecec0db054298a8bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:25:07 +00:00
TreeHugger Robot
8a9e70deff Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62 am: 178d880667 am: 5062c59bc0 am: 10227c4435
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410

Change-Id: I2102d20fd3126f5df71b63d9f5148498af474688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:24:56 +00:00
Bill Yi
d7c80c06db [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours am: cdfa21f8d7 -s ours am: fd5b639bbc -s ours am: 8ce699b2c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb537d0c298ebbe1aeb9b230cf78c7a04d8cee06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:24:41 +00:00
Lin Yuan
9e84690fb7 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I0521342515969ccb2d46b9e9159d29b998713cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:41:25 +00:00
Lin Yuan
d2ddc84c14 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I69571348ce67c5a5572a5fb5c15d31c88fb26a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:37:49 +00:00
Treehugger Robot
aa8324bb23 Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586 am: 79c090dd85 am: 9147bf15e7 am: af35c8651e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411

Change-Id: I8e1680b470e382951d073d128054d8d584612b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:31:16 +00:00
Bill Yi
c643a5ded8 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f am: aa9489179b -s ours am: 2658b9338f -s ours am: c8076ba7b3 -s ours am: 54c9b46e5d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id340e6bb894469bf7f6810352ec27660094bcea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:31:10 +00:00
Treehugger Robot
5d77af25c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033 -s ours am: d25d75be91 -s ours am: 20bbc6456c -s ours am: 7f69c0af96 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibbe1abddc10f4044b96e03a9724ecff71537d2f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:30:13 +00:00
Bill Yi
75c57786fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683 -s ours am: afc79889f6 -s ours am: 8cef29d5c4 -s ours am: 89a060700a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25e5725ec17cd64028ebab8eb4e3588c57e069e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:29:48 +00:00
TreeHugger Robot
b45f6fdfb0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6759c1f3bc -s ours am: eece14a6a3 -s ours am: df6c009ae7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a08fba59832f15f1faa46a80f8468f5cde2a23e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:25:31 +00:00
Bill Yi
624c9366d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d0ccf90c -s ours am: 77442011d4 -s ours am: de7eacdb40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f3264b32aee17c424b1e99a387b46e2f3d74569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:25:19 +00:00
TreeHugger Robot
e0850b91a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5b29767921 -s ours am: f936295a2a -s ours am: 00e2597fe8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a43735eeb71ec25cdab20b30d118cfd906835f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:25:16 +00:00
Bill Yi
1166024628 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e2f1374d0 -s ours am: a4e860e19e -s ours am: fc6e3f852d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I295aa381b50869e597b6bf18682db8790dffe69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:24:53 +00:00
TreeHugger Robot
8d3015b95b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b4d72181f8 -s ours am: 379737f0be -s ours am: 5d1a66f3cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: If10fde4806cd0574c5e834556b4525112872cfc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:24:29 +00:00
Bill Yi
3074ac53cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c206bd1217 -s ours am: 45f180037e -s ours am: 3b74c4ae6d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iace9d618349dc7033ada9f3b01078001657fb4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:24:13 +00:00
Treehugger Robot
b88bb06eeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9 -s ours am: f9e3b286f3 -s ours am: 6fdd87169a -s ours am: 9f39423cdc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8970d9d69563f7a9e137d69f9bcf4644037ec13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:21:30 +00:00
Bill Yi
36b311beb7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c -s ours am: 77e56766c3 -s ours am: d526068047 -s ours am: f834da08b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e04a35e3e9736854878b32ab2021d03b87fac8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:21:17 +00:00
Treehugger Robot
3bf4faca9e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: fa11502d2f -s ours am: 532a6a82ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d1fab1dc18c82dccea246ae2d77856c474e63ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:19:46 +00:00
Bill Yi
bf1acf33cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e72e95fe98 -s ours am: 295c824525 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8108ea7258e86d107f66415ed20a3b6f2c3a4cf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:19:43 +00:00
TreeHugger Robot
b9c6eb777b Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62 am: 61f1af73e6 am: b29f1fd82c am: 78390226fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410

Change-Id: I29d5bed14b8e238e9656c7b2e0a6c3c6e3bf39e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:19:02 +00:00
Bill Yi
3b7be7c3b3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours am: 44d28ab6f5 -s ours am: 942a0adeb4 -s ours am: 664b520cd8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94c8dd6c46c9f9ae1f4ec34f1abbe05ea956e287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:18:45 +00:00
Treehugger Robot
ade779e66a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: ddb36c89f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7779f2e646746911fb3c239034cfc6cc15ca678e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:12:28 +00:00
Bill Yi
7922024c20 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c -s ours am: 77e56766c3 -s ours am: 81a9f0e818 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic130abcb06c94263697653059db2ded4090bb855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:05:34 +00:00
Lin Yuan
ae2dd3d513 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I3a9a9ef33b0a7fd985861a85d63d5078d3fe5aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:53:38 +00:00
Lin Yuan
eb3be1fa5b [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Iff01dd3f1528b2ded54b281c1f810293093f2ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:52:56 +00:00
Hiroki Sato
c72e8c1eda Merge "Don't show bubble settings when framework doesn't support it" 2023-05-04 00:44:43 +00:00
Treehugger Robot
ddb36c89f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65d76144eb2ddd9894a5a769d7524ac6f2e8b5c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:28:07 +00:00
Lin Yuan
d8321f5df7 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I23d09d7f0c376493ba30ac38577d196b69d46335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:02:52 +00:00
Treehugger Robot
a1b3c500fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17e41ec494a5893cb8eb1f3b8dfbeb46e28d7310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 23:46:47 +00:00
TreeHugger Robot
47e542d48a Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62 am: 61f1af73e6 am: 9cdbbc334e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410

Change-Id: Id7b67eb39d5a2bce83b484160b16c2040b41a9f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 23:45:19 +00:00
Bill Yi
9b1094e52a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours am: 44d28ab6f5 -s ours am: cc1284d1e2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad84abbf9995a56084b9d65e186bf0c11b4c8869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 23:45:12 +00:00
Treehugger Robot
8df2ac3f94 Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586 am: 48f8eecbd1 am: 089c61b6ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411

Change-Id: I39bdb03d3524f53e458c58ff3273176179567f90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 23:44:20 +00:00