Commit 6f51f61a 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 

am: 9cf0c2c6

Change-Id: I5fc2fe73c0d3a2ad34a3f6d320679b0920991940
parents e89aa639 9cf0c2c6
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