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

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

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped: 17c45d58 am: 3547f78e
am: 6eded754

Change-Id: I3392b0dffc7f630ad2ebf06d817c717415c4c1d5
parents 908bb75a 6eded754
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