tree 40ccb70d7abff70474468f0538f0568c2918777c
parent c403c2bd93d723242891834e5a4ba6ef1d79aff9
parent c5447d70d3629a5811b44767e8983eeb7bf247b1
author TreeHugger Robot <treehugger-gerrit@google.com> 1636445295 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636445295 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id8a548cc6bc3f9ca394b68d4db4e1377a139ed56