Commit Graph

112330 Commits

Author SHA1 Message Date
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
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
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
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
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
Hugh Chen
d6544f764b [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: 5f0321cb0a -s ours am: 442a5f369b -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: Icf5b77a8b70b4384d89dcc55e64fce53ee5ba8cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:18:44 +00:00
Hugh Chen
2a2f58eca7 [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: 3df7e470cd -s ours am: 8493108ef0 -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: Ia3750cd7af89d0effdaecf4b4f95b11b0b146a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:18:31 +00:00
Hugh Chen
2e6b746a8e [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: a18e806c42 -s ours am: af40981e1d -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: I555c37f82392a0865dc4b7e36e0a124c4af9fd61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:18:18 +00:00
Arc Wang
d578c66eab [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours am: 8d2a48f22f -s ours am: 08df31aab0 -s ours am: b53ed091b3 -s ours am: 88dc583ee4 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

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

Change-Id: I7b37a4a424861e448777125bc850ad9291c12159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:18:10 +00:00
Tsung-Mao Fang
d3e1af4fbe [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: fa1c525740 -s ours am: 09f20493a8 -s ours am: 0b28b84745 -s ours am: f44ea8ac2a -s ours
am skip reason: subject contains skip directive

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

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

Change-Id: Ief011906eea2485eaf89f7a553c3a80a390d8573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:18:07 +00:00
Hugh Chen
174979c254 [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: d9063ac645 -s ours am: 074274cc1b -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: Iee499e7e839dd10bd7f93851db8ee1ecf1c1c7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:18:05 +00:00
Arc Wang
7330a86029 [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 am: 8b268b18fe -s ours am: 1834c4bbfe -s ours am: 7fcf96d599 -s ours am: c7bc1cd672 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

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

Change-Id: I36fbf484de88d50cf545df0bc4f36b6649d4862c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:58 +00:00
Tsung-Mao Fang
335b57ff84 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 am: 6315e164f7 -s ours am: bf095a51fa -s ours am: 6cb16367a0 -s ours am: b490f37e7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1912cf3c756549abf8da3e5e4a48e0b035b27c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:57 +00:00
Arc Wang
a5269e6552 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-mainline-prod am: 966a2dc8d2 -s ours am: 39fbff813e -s ours am: 82fc149aa7 -s ours am: 8fcadbd219 -s ours
am skip reason: Merged-In I044b680871472a3c272f6264c4ef272df542112e with SHA-1 67b9fb57ea is already in history

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

Change-Id: I4f91d04f6d3b747382d63008cf92d79cc91a4910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:47 +00:00
Presubmit Automerger Backend
2f5d55acc6 [automerger skipped] [automerge] [DO NOT MERGE] Fix Settings crash when setting a null ringtone 2p: 67b9fb57ea am: 03dd4cc7d2 -s ours am: 719c5bf03e -s ours am: 74c53ed19b -s ours am: 1de9289858 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic441f5991b38027289394d1929a0c08414c41f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:45 +00:00
Lin Yuan
a6dcacbb88 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a am: 36069908ce -s ours am: 02ca401236 -s ours am: 686679749b -s ours am: 7d66c0ff97 -s ours am: 8d1ed52e6b -s ours am: fc42296e3c -s ours am: 029080e5da -s ours am: 337765a2a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18cf493cbf5ffe44abb3ff2bebc8009be5d3c9a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:36 +00:00
Lin Yuan
136f32048f [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d am: 4daf65ea3b -s ours am: 9d3371ee23 -s ours am: aeab9be2c3 -s ours am: c24add0997 -s ours am: 263c0cfaca -s ours am: 1911d2fbb4 -s ours am: 5e8d47f7c1 -s ours am: 057708d529 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I58305dfc93c64deda51947c4a2f7096e4507b557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:35 +00:00
Lin Yuan
1c0e8bd8d3 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6 am: 95d21bc12f -s ours am: 18c00007b7 -s ours am: 8e637809fd -s ours am: 312065af42 -s ours am: 91a7965763 -s ours am: d618ebd737 -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: I6e7691b1ca90d7f99e2407383c48b368b3edab08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:22 +00:00
Lin Yuan
9377aa495c [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: bd539bfe6d -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: Ifdd09fd90e453ea1f8e9c743ebc95fb9e4e989fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:21 +00:00
Lin Yuan
cdd91edd87 [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: 1e1a21a6b2 -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: Ib5203e3c6c58a9c100e5e0a92d7cc83f24fb2a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:11 +00:00
Lin Yuan
bdc7a3577c Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod am: 10b5ab82f5 am: ae20f0e5bd am: 06c8e2472a am: b55b5a4d10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I529e6c4202ede26aa3a0b6ac7b62ba2c8db22424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:03 +00:00
Presubmit Automerger Backend
9212e340be [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: 0aa8a3174b -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: I6983fc5cb5e97655502a58aa5fe7e53f2b5cc9bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:17:02 +00:00
TreeHugger Robot
330dcf14bd 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: 7bca95eafe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I945ef5711fa35d392d8811dda2ba16f9ddc8c9c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:16:52 +00:00
Automerger Merge Worker
18c9c68dcf Merge changes from topic "am-085dea5a824d4714a317e3fe17b02ff8" into tm-qpr-dev-plus-aosp
* changes:
  Merge changes from topic "am-28212c0c6de44616b530d551080b64df" into tm-d1-dev-plus-aosp am: fc9724a1bb
  [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: bee605f4c6 -s ours
2022-06-24 02:15:46 +00:00
Automerger Merge Worker
69c5aae39e Merge changes from topic "am-28212c0c6de44616b530d551080b64df" into tm-d1-dev-plus-aosp am: fc9724a1bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693626

Change-Id: Id1fa2a26cac36616385800a2bbf03c4f93181b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:15:19 +00:00
TreeHugger Robot
f526fdd326 [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: bee605f4c6 -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: I034b636b512b439255b035aad35f7df47c6a2802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:15:06 +00:00
Bill Yi
0039ee096e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: fcf5908f6e -s ours am: d7c955786d -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: I0a610c0fa3a61390357ab8d741faf61288c72bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:13:40 +00:00
TreeHugger Robot
9c00fdc2db [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: 7c036d8400 -s ours am: b8b72d6898 -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: Ia72de927ea32aaaba45194df162335cc590dcd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:12:26 +00:00
Bill Yi
73198caad7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17c2fde132 -s ours am: ff8cd75636 -s ours am: 0266b7f4b8 -s ours am: ce4d606063 -s ours am: f9ec904bd6 -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: Ieda83993dc006f2bb5ad69855d986cfc84eb2a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:12:17 +00:00
Automerger Merge Worker
124ffde2c9 Merge changes from topic "am-2770a49bdf764f0d95dafee4d391aa8d" into tm-qpr-dev-plus-aosp
* changes:
  [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: fc55b18096 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours am: b716d79126 -s ours am: 914aa7d423 -s ours am: d4daeda7df -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours am: 7f9fa7fedb -s ours am: 29bb5a7941 -s ours am: 585271038e -s ours
2022-06-24 02:12:08 +00:00
Bill Yi
da02d0710c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12968349f4 -s ours am: 803533153b -s ours am: e960cbff45 -s ours am: fb50082d82 -s ours am: 184e7c6926 -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: Ief8ed036c96b36e604737bd94e81fc85a774a5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:12:07 +00:00