Commit Graph

113181 Commits

Author SHA1 Message Date
Lin Yuan
8ad51908f5 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a am: d78ed7aa73 -s ours am: 36b5a2c8d3 -s ours am: afc61aa166 -s ours am: 86756bbbcc -s ours am: 5a019b3bb2 -s ours am: b18f65a680 -s ours am: 3f23b58bb3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e6c513a920a614c9773c036e1d492672e225a43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:51:39 +00:00
Lin Yuan
58aaf02120 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 1e45df2451 -s ours am: 4b9394808a -s ours am: 0af985d835 -s ours am: d015f6258b -s ours am: 54c6d7ed8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic8b7e21d9a176f89d6b9d929b85def165ee80cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:51:27 +00:00
Lin Yuan
d2b0f7849d Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod am: 10b5ab82f5 am: ae20f0e5bd am: 06c8e2472a am: 42d32d9c2a am: 99cd6a4089
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I4b2fb5f4af99e8e37a4c828c7f81106a8ac303ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:51:16 +00:00
Presubmit Automerger Backend
fc82ead18a [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: a31031e5bb -s ours am: 24d50a6c2d -s ours am: a6d96c8c56 -s ours am: 0202695dfb -s ours am: bfc9515553 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I259e77c5f63f72150585f2cab5e74aaeba8223d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:51:14 +00:00
TreeHugger Robot
57fd25f4d1 Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: 295de2209f am: 4860d558bf am: 9813fb3c89 am: 7aff113fa2 am: 8f8106ab64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I7d94a402edf71a456fe3448de1d373961b00f56c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:51:01 +00:00
TreeHugger Robot
7491f6bd81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: a3be04c95d -s ours am: 3f06f6f6d1 -s ours am: e292a16361 -s ours am: e7d52b4350 -s ours am: a14bd57243 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1389de1af5f2605a44b40b2243c94f6d364f567b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:48:01 +00:00
Bill Yi
6aae0f6fe6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dea4314ee -s ours am: 4dbeddd095 -s ours am: f05a1e9f76 -s ours am: e35d73c198 -s ours am: 1fd98c9935 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88141ac7a06163b50ab95ca8037dd22061d60576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:47:53 +00:00
Bill Yi
f222f74427 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87a8b49ca0 -s ours am: d839af3be9 -s ours am: dd5dd0af82 -s ours am: 26b3bb64ea -s ours am: 5e1c6d6512 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1bcf7db2f1689cc00bcb486d01a2e588073e0b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:47:38 +00:00
Automerger Merge Worker
7c3e6922c1 Merge changes from topic "am-fff65bf311764194ac266fe45e89521f" into tm-qpr-dev-plus-aosp am: 3ea6dc01f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519782

Change-Id: I8b238c94f087ccedd0cf94e0f89063d6b0d53791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:26:32 +00:00
TreeHugger Robot
34c8dc7484 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 138ee00007 -s ours am: c5d09db1d6 -s ours am: e48537d1c3 -s ours am: 3e3c6aea88 -s ours am: fac17d77d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9727eeb9f52c2f6ebc276a9037806351abf01077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:26:20 +00:00
Bill Yi
5ab22a539f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: 4bdcf48ffe -s ours am: b2da2beab0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie269f3f88a3716e73db27f1aea1639f8c6e69852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:22:21 +00:00
TreeHugger Robot
f45487db4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours am: 2d21dce94b -s ours am: 92bc197d7d -s ours am: df4c6650f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7f09dc3176579af57b62ff221bbfdf4bfe4e2ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:19:38 +00:00
Bill Yi
2955856271 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours am: b716d79126 -s ours am: 45e908da1a -s ours am: 7c933ae10f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I730bf55aff05b1b390bb8d4ed005ac4cddc7d0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:19:34 +00:00
Bill Yi
2833d51be5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours am: 7f9fa7fedb -s ours am: 61bc8e9096 -s ours am: 0e1b357011 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20ad2fbcefbbc873917fe31ab2504f6832aa75af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:19:17 +00:00
Automerger Merge Worker
19e69b18c0 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6424f8d388 -s ours am: 1da0b28099 -s ours am: d0f541a7d4 -s ours" into tm-d1-dev-plus-aosp am: 2ef95bb8e5 -s ours am: f371c56c23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6cc7c08413cb9b1d562fdf891533da77df43b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:17:31 +00:00
Bill Yi
e7c8d83cad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6424f8d388 -s ours am: 1da0b28099 -s ours am: d0f541a7d4 -s ours am: e26c118b64 -s ours am: aeea67a974 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I881e89d0b32449ceb035fff27864d2f3e984d9fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:17:28 +00:00
Bill Yi
ba1e6914ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -s ours am: 4fcc193a8b -s ours am: a12b67f6ed -s ours am: c5c3355e5c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5fbf64957698eceae23d4c43c5800ff3dcf54a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:03:25 +00:00
Automerger Merge Worker
f54d0819c5 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: fcf5908f6e -s ours am: ee5792817a -s ours" into tm-qpr-dev-plus-aosp 2022-06-24 03:02:08 +00:00
Hugh Chen
92649c1592 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 5124046494 -s ours am: e4d07bd71c -s ours am: 51e81080b9 -s ours am: a9c7ff963e -s ours am: 7d827bc367 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2fc9bb5694293a48111845e7a22cbbfa3c8db7f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:01:46 +00:00
Hugh Chen
23c021d992 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: b71cc3b9fd -s ours am: c70937ef85 -s ours am: 2ba95de622 -s ours am: a017eda725 -s ours am: 835478b92e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab5c6f7ab57fc0c9b2f4bbb07d2dc459c2939260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:01:35 +00:00
Hugh Chen
84b06f65d3 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: 7bde548ee0 -s ours am: d5d8bbd18d -s ours am: 83df6fa0a2 -s ours am: bd6e75d68c -s ours am: 8e64fe3c37 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26c5796cf7225e741577615a2e6a7bca6eba10af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:01:25 +00:00
TreeHugger Robot
15cd20ddc3 Merge changes from topic "presubmit-am-36bba661a52b4792a8d74b3037c240af" into sc-mainline-prod am: ff36a38719 am: 8ebd0c1381 am: d8891c6611 am: 8a7d7999d8 am: 80d7fdb911
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690

Change-Id: I8a56b0c38373ee39f06ab31ded9a27fd47310af4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:01:15 +00:00
Hugh Chen
8c5740e601 [automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae am: 10bdea1a98 -s ours am: d37402a2de -s ours am: a1cb5c6140 -s ours am: b96b5015a4 -s ours am: 293eab9303 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iabdc142067390f6c16c484ee47249921d791d6ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:01:13 +00:00
Automerger Merge Worker
ebc03f899a Merge changes from topic "am-2201364a6cf442e88b472c0e36774c37" into tm-d1-dev-plus-aosp am: 67b845265f am: a4bf8fa4ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396963

Change-Id: I91974c06e15179f14ce1d8ea15d6c6d33a3d934c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:00:11 +00:00
TreeHugger Robot
df8d9a2af3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9f9f0706d1 -s ours am: 8af957252a -s ours am: c0cc128feb -s ours am: 3afce55e18 -s ours am: d368d3e505 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If8bc93124dbf6673585e02113081eb46a8856e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:59:56 +00:00
TreeHugger Robot
de09f078db Merge "Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent" into tm-qpr-dev am: ce2405e922
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19013797

Change-Id: I07be1bdf7db2ce3d619006a0be4bbd7bd1c8827f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:58:42 +00:00
Bill Yi
1c1c06e040 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: fcf5908f6e -s ours am: ee5792817a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0437dc5065bc49805e2c2bac0b956924fee8f8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:58:38 +00:00
TreeHugger Robot
d4db7fa1c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours am: 2d21dce94b -s ours am: 886b1ed6c2 -s ours am: b6c6baf9c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I940b98c8d2675e44de657650e0a7f319220bf071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:55:32 +00:00
Bill Yi
57d4ba868a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours am: b716d79126 -s ours am: 914aa7d423 -s ours am: b9e6b6b5f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f1e2bca4267f35bf7709c61f9cd274d0a36a8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:55:25 +00:00
Bill Yi
d13efd4008 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours am: 7f9fa7fedb -s ours am: 29bb5a7941 -s ours am: 2421b38193 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie76cd9b326deec7ac0902dbae5accfb9ad0b85b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:55:12 +00:00
Bill Yi
6c9ef0aae7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -s ours am: 4fcc193a8b -s ours am: 7ef26b068f -s ours am: f5971dd419 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f0c3789d04483d3135d6a7a390b1c30c1a00103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:47:40 +00:00
TreeHugger Robot
0a1b86564d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours am: c9a2542867 -s ours am: 975270c942 -s ours am: 757dd97c16 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28781d8e73217728146628909f7143f5efa0c7e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:45:13 +00:00
Bill Yi
898b13d171 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours am: 6f1895b024 -s ours am: 9eba6b6755 -s ours am: 405c452c8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ad81cb0b88d58a783c6dd9572a64a33fc17f061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:45:03 +00:00
TreeHugger Robot
02a5cd38f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours am: 8cd16f986b -s ours am: 3116a23082 -s ours am: 26653b5de6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib03b4098560c8e76fc84122b580bb9b21b020eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:45:00 +00:00
Bill Yi
c073a3cd87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours am: 7125a6bed3 -s ours am: 1a6e2f7f6f -s ours am: 67cc740687 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I11e6d2adbf4c3651e68c4596d0b415f5ec1a97b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:44:53 +00:00
Hugh Chen
2b798b721d [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 5124046494 -s ours am: e4d07bd71c -s ours am: b6ab74be3b -s ours am: a6d53f3ed3 -s ours am: 372f16039d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I418054ed10d503e8d59eaf2693de5dd9cc2d8069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:42:40 +00:00
Hugh Chen
ae611b8df9 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: b71cc3b9fd -s ours am: c70937ef85 -s ours am: fe6f8a704f -s ours am: fd43463402 -s ours am: e19e8400c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic2b317866268338e197b276e656a5baff752a3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:42:30 +00:00
Hugh Chen
c2b77a6547 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: 7bde548ee0 -s ours am: d5d8bbd18d -s ours am: 824b9cfa41 -s ours am: 09a59715f5 -s ours am: 8839ec7605 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3461e21a7cb1599a04beb03fc535d9906240ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:42:22 +00:00
TreeHugger Robot
ca0401012a Merge changes from topic "presubmit-am-36bba661a52b4792a8d74b3037c240af" into sc-mainline-prod am: ff36a38719 am: 8ebd0c1381 am: 0bd884edda am: 9cdb80120d am: cc23a9b4ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690

Change-Id: I67a7cf2ad279a031579c9d10f0e32589604e0816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:42:12 +00:00
Hugh Chen
3577415a28 [automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae am: 10bdea1a98 -s ours am: d37402a2de -s ours am: 414873fa58 -s ours am: 19f8815eef -s ours am: 03642f2fc3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I611b5acf9fc132dea3dce7ea20d6de2c0bab8074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:42:10 +00:00
TreeHugger Robot
648cde9a5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9f9f0706d1 -s ours am: 8af957252a -s ours am: dca1d629ba -s ours am: a9824d3550 -s ours am: 0ac852270d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7c7e6fe39e68784b4581b315c0512fc6fbe21e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:40:46 +00:00
Bill Yi
2926ba6fd1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17c2fde132 -s ours am: ff8cd75636 -s ours am: 0266b7f4b8 -s ours am: 5f29859d53 -s ours am: 96049d88a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9cdfef0c2abf96e96483938fa5d203fd878f65e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:40:37 +00:00
Bill Yi
6ac641ca07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12968349f4 -s ours am: 803533153b -s ours am: e960cbff45 -s ours am: 3c2ae0a392 -s ours am: f36fd062ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39c553f8d1fbd98ec55ebf4e088289cecda4d665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:40:28 +00:00
Raphael Kim
4378e68156 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: fbfa9e2df7 -s ours am: cf3fe49391 -s ours am: f338527c54 -s ours am: 70eb44d745 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 8d749c55f4 is already in history

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

Change-Id: Ic4c2c2547eb1007c8d290f412be36709227c80ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:39:15 +00:00
TreeHugger Robot
ce2405e922 Merge "Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent" into tm-qpr-dev 2022-06-24 02:38:54 +00:00
TreeHugger Robot
52fb582fe2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours am: c9a2542867 -s ours am: efd715f248 -s ours am: fe14c2c5ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I206aaa5d63e5031aea2ceab018c82e193ae4c80d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:38:42 +00:00
Bill Yi
f5709fa25a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours am: 6f1895b024 -s ours am: 92aba93e39 -s ours am: e60add9114 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaf9a5cffa82623a5fb2ebd7a871001fe3be6f965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:38:34 +00:00
TreeHugger Robot
0797a8cee8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours am: 8cd16f986b -s ours am: f8e852db28 -s ours am: 394e442977 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2dc73d8c2196f96ae3e05a5905d7fdb5df373896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:38:32 +00:00
Bill Yi
eef5b33a7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours am: 7125a6bed3 -s ours am: 76894ab4b7 -s ours am: ea6584d71b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83c01fc293793a819400540616010e1f63f8d904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:38:26 +00:00
Bill Yi
4a81100db6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6424f8d388 -s ours am: 1da0b28099 -s ours am: d0f541a7d4 -s ours am: c103c07516 -s ours am: 65387c95a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d68368b67e1d51a848c188c2f266886a03a5039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:36:10 +00:00