Commit be076494 authored by Martin Brabham's avatar Martin Brabham Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe639 am: c80a6ed6 am: 6097686f am: 0433d94f skipped: 4e06b902
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe639 am: c80a6ed6 am: 6097686f am: 0433d94f
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe639 am: c80a6ed6 am: 6097686f
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe639 am: c80a6ed6
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe639
  DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
parents dc272a53 f9ec56df
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