Commit 9cf0c2c6 authored by Martin Brabham's avatar Martin Brabham Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev 

am: 48232415

Change-Id: Ib6aefc575fd54ec07d9f4ae3c25e12b44e05dd29
parents 4fcab76a 48232415
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment