tree 6771264f43bac4783d9cb37c00e2f5c7fc93b30f
parent 706a7f454b38637ed59b4c1a89569acf88afa45e
parent 6c20cafad867e88e459e27ca3c2a2965af23e89e
author Martin Brabham <optedoblivion@google.com> 1559576467 -0700
committer android-build-merger <android-build-merger@google.com> 1559576467 -0700

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 9cd13ebccb am: d7f9b19381
am: 6c20cafad8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic13cb2ca31f5324e090f7d6d3de675f002a2724f