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

[automerger skipped] Revert "DO NOT MERGE: btif: require pairing dialog for... 

[automerger skipped] Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" am: caff42bd -s ours
am: a3330ce6

Change-Id: I8d329840d1b0c168b5876c6cd85cd28fee0b5f72
parents ac0dc298 a3330ce6
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