tree 76ad2c757647232039fab48936245b91c3ab1a2b
parent 408047571612289d69c32e322e11543d69227c2e
parent 5b2a1e6d22a35b309661621f195da608500c4cf4
author Martin Brabham <optedoblivion@google.com> 1559576908 -0700
committer android-build-merger <android-build-merger@google.com> 1559576908 -0700

[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am: 357a36f35d am: b3bdb9e341 am: 7db943f62f -s ours
am: 5b2a1e6d22 -s ours
am skip reason: subject contains skip directive

Change-Id: I80d696d5e8b7edc00dd0c2ec6f9e8ab81b74eae3