Commit a3330ce6 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 JustWorks SSP" 

am: caff42bd -s ours
am skip reason: subject contains skip directive

Change-Id: I28ca9e4d3b1995295a392f58f1e973e2212968ac
parents a73dfccf caff42bd
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