Commit Graph

122998 Commits

Author SHA1 Message Date
TreeHugger Robot
589bc875e0 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 2c750a41f4 am: a9ce3ae056
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I722166b954806d9973ab531e18c1226fd989824d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 05:27:23 +00:00
Treehugger Robot
5241ea22da Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 7e99eaa9bc am: eb960845fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I7a026ae6079a06dd867d7248281dc6c3714caa5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 05:27:14 +00:00
Lin Yuan
369582e3b6 [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: 19eb02122b am: c0c804c9b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

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

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

Change-Id: Ia2c3fedf4533efd07fff83adb8ad34f2300468a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 05:20:50 +00:00
Lin Yuan
a6fdd6b3f9 [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: b0463498fa am: 959efb5af3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

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

Change-Id: I22e417546e6b53092267d145c6cfd2151b5dbb53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 04:44:27 +00:00
TreeHugger Robot
a9ce3ae056 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 2c750a41f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I111b206de6a699d049dee9845053949c693a699d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 04:40:52 +00:00
Treehugger Robot
eb960845fa Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 7e99eaa9bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: Ibe65cfc9bad66afb9a5e4d24399ddcfad9d484c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 04:39:07 +00:00
TreeHugger Robot
2c750a41f4 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I831234e174a614c1b6ce20f9ae6a70cfe9b92b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 04:21:34 +00:00
TreeHugger Robot
7bf4c8f9f5 Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev 2023-05-04 04:09:13 +00:00
Lin Yuan
0c20a3de9a [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: 19eb02122b am: fbd437f883
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

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

Change-Id: Ie788d45a0d7af9360f4b4c8cbda27f2a1cad42d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 04:01:44 +00:00
Treehugger Robot
7e99eaa9bc Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I04ced0608e4e782af915767ff477cca01b369d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 04:00:30 +00:00
Treehugger Robot
d345ba6a4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: cfaa877732 -s ours am: b42e6153f1 -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: Ie6eea846dc2285a2a8dbe9471c9a74ae55b76067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:55:12 +00:00
Treehugger Robot
cc7068328f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: e46c4e5a87 -s ours am: d3b8f7769f -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: I32222d11ea3b1e8fce5c1a4f545bb288bf97cc6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:38:30 +00:00
Treehugger Robot
e71643efac Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev 2023-05-04 03:15:40 +00:00
Lin Yuan
fbd437f883 [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: 19eb02122b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

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

Change-Id: I1e7993a52503d2d205f824bc61ab84ef87a71de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:13:25 +00:00
Lin Yuan
c0c804c9b3 [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: 19eb02122b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

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

Change-Id: I9c27eda1ddc2375f1f5c36a3a612f20696329679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 03:09:09 +00:00
Bill Yi
3314ef577b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c -s ours am: 8b08d034f0 -s ours am: 4417b47eea -s ours am: 6ec725b107 -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: Ia0fa7a4c75ba00ced873260c12e02bccbc3beeab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:52:53 +00:00
Lin Yuan
a8bcae516b [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: 2ead04b76a am: 412befc3e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I95e888f56404a34707cad9b23bb9722418f3c335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:52:07 +00:00
Lin Yuan
959efb5af3 [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: b0463498fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

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

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

Change-Id: Id537fb7d885aee6c6cec7fb9093d496d6e3f095a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:49:00 +00:00
Lin Yuan
b0463498fa [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: Id2aff42c95548f27a361ac7641d9338b191d220e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:45:43 +00:00
Treehugger Robot
2d65a8707f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d -s ours am: f2fa6d46d8 -s ours am: ef44b8dbc2 -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: I59422d552e888644a5a1640ec7bf73331c23e983
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:33:10 +00:00
Bill Yi
51a32cd79b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b -s ours am: a67463b464 -s ours am: bdbf0a7532 -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: Icb9bfb837536b3f5d887ffad8a4068fb420d9024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:33:08 +00:00
Lin Yuan
19eb02122b [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: Ib80f670072c0374a62799565be55c60717a52f55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:27:50 +00:00
Lin Yuan
ba360fb0a8 [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: Id91a0044b2863e3cc0d454ac520bddd37f93efba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:27:32 +00:00
Bill Yi
621c950474 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c -s ours am: 8b08d034f0 -s ours am: c4204c0ef5 -s ours am: 9df92aeffe -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: Ibc7ad5a80e0ab095ff1736619d3bb23e437776a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:26:32 +00:00
Treehugger Robot
600f48b2f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d -s ours am: 4195ac4a28 -s ours am: 228bcb551f -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: I92eab57ea6ba3430c1c66643949ff5b62f86d3d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:25:51 +00:00
Bill Yi
0806c0eb70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b -s ours am: 56cb3df78d -s ours am: 1666295397 -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: I48bbea060005a8cb99d00e7e8d66430f7c495b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:25:45 +00:00
Treehugger Robot
84e44b9d7b Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586 am: 79c090dd85 am: 69d791cdea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411

Change-Id: I01c2a006e2e82d3ac5d6f0a7f23f14c067e7bc95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:25:17 +00:00
Bill Yi
7e61bd7d41 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f am: aa9489179b -s ours am: 2658b9338f -s ours am: 785fb61892 -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: I28055b15d069ef9f45a726eed9eb9f2fcd657d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:25:13 +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
717020a165 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033 -s ours am: d25d75be91 -s ours am: 0534bf419b -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: I427d7996e02f39afcfeefe728970f0c6df6bcfa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:24:50 +00:00
Bill Yi
7b72ddf8b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683 -s ours am: afc79889f6 -s ours am: 49948acea6 -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: Ie5ea50e1f75317c07c609b3bdecaad461175a87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:24:48 +00:00
Lin Yuan
29d5694857 [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: I86c12e6025e4390241a4b951dc36d41e8e8c4c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:23:33 +00:00
Lin Yuan
2ead04b76a [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: Id6c5d54610e3c03f47bc59871007b98bde306e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:22:57 +00:00
Treehugger Robot
300c130a64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: e46c4e5a87 -s ours am: 1f1a6ee337 -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: If49356da0b766801bd71ea848097a89e5a23b846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 02:05:10 +00:00
TreeHugger Robot
47bc907c4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6759c1f3bc -s ours am: 8637080247 -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: Iddbca02248c2c52d7c1f0901f01a25290e60b2ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:43:55 +00:00
Bill Yi
9b7235aee0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d0ccf90c -s ours am: 1adffba000 -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: I2a665cca3763fcb1570c0c69622858258911af56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:43:47 +00:00
TreeHugger Robot
9f6c9f593b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5b29767921 -s ours am: 68f57638ac -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: Icd2a03f2716f71fac414d3d9c2585168ded53ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:43:43 +00:00
Bill Yi
825ca04e00 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e2f1374d0 -s ours am: d3507f7c4a -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: Id9f55baeaae42cf37dd9134ebd6e8e3d57ef364c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:43:22 +00:00
TreeHugger Robot
69e8954e1c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b4d72181f8 -s ours am: e9ed487381 -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: I0bf917e3c052c95737e01e440cb47e8b8e98ddc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:42:58 +00:00
Bill Yi
142b3fc140 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c206bd1217 -s ours am: a91419849d -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: Id16a3272369bd053d194a96a9ebd29f6b73a2592
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:42:39 +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
Treehugger Robot
b42e6153f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: cfaa877732 -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: I8632a77602de701a395abbe0303910f3608105f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 01:38:02 +00:00