tree 880ccbef1857e74c9f08cca54e03954cecacb3f9
parent 9576dbc70371a8b6f01205ea62f250a48955b7c5
parent f5588536c32633339fe297080f17b91c49be7bc3
author Martin Brabham <optedoblivion@google.com> 1559540909 -0700
committer android-build-merger <android-build-merger@google.com> 1559540909 -0700

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped: 8b2e81a722 am: 008c7ff7ea am: 0743275088
am: f5588536c3 -s ours
am skip reason: subject contains skip directive

Change-Id: Id99b668d45dd746544d10dde38b5e9a6049ef92d