tree ae501d4180a7894b6c0c0d56713c158080b75ec0
parent ed7072411394ab4401e5f98e7b79af9505211696
parent 43902e35c019a6865d6b273fb4673ffa2621b49e
author Martin Brabham <optedoblivion@google.com> 1560914690 -0700
committer android-build-merger <android-build-merger@google.com> 1560914690 -0700

Merge "Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"" into qt-dev
am: 43902e35c0

Change-Id: Id2b5882b6c198e56f3c1dcd633fe970c3df3abf1