tree 9fd6c9b89354c29133e18fbc9938d7e2b561c312
parent 52b37ccbdcd82a25f934b138d898c6744b715c95
parent 9c1eb61f8ec731fb1026ede1fe7bd1ccf6630430
author TreeHugger Robot <treehugger-gerrit@google.com> 1636444735 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636444735 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: 9c1eb61f8e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib2705b029108440fe528a89fd4c95ab7e50ed23a