PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,479 Commits 1 Branch 0 Tags
55285fddbed40aa5bf850e7957899e17c3eca97c
Commit Graph

125479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b3d65a57af 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: I12332396bed68d97d711926f8d3dc076864ca1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 04:00:30 +00:00
Treehugger Robot
19a610e0f1 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: Ic56a9b910f78144fc43fc713a7baca1cdcc10b6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:55:36 +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
c8225b692a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9 -s ours am: f9e3b286f3 -s ours am: 08d728c8f4 -s ours am: 820e4bf1cb -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: I38ea40b853b554e4d87421d6c4455a2d57b88380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 03:52:45 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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