Commit 594d1339 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f" into oc-dev 

* changes:
  [automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped: 17c45d58
  DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
parents be076494 3547f78e
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