Merge changes from topic "am-814301c118fd4729b6077a96e185efbe"
* changes: [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am:d89fa348edam:8237448ebf-s ours [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am:d7c50f7952am:bfc96e1036-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
6b7f01f1e2