tree f098f6fea9fbf4b4810db1741235f7779e7b8a62
parent 955e1538153eb0a29346cdae29df9c5c07ff91d1
parent 7a5b3bcd8663b621eab39c345edc2c8a4e8f195e
author Hugh Chen <hughchen@google.com> 1636447380 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636447380 +0000

[automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: 56b95bd8c0 -s ours am: 09258363f5 -s ours am: 7a5b3bcd86 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5fc240d60e6a5c54a085e8072e51eed483caa987