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

Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev 

am: 3bf41c03

Change-Id: Iea733c12789b381728a66f9de7c60c9420072cf1
parents 7316c97c 3bf41c03
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