Commit dbad5b2a authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state... 

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f807 am: ea5e8148 am: 81488162 am: 2f19a132 skipped: a328e6dc
am: 2cef3d79

Change-Id: I6af0d17305a6fbede200e3ee0e1e951f0232ff01
parents dd2e1109 2cef3d79
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