Commit 1d752341 authored by Ugo Yu's avatar Ugo Yu Committed by android-build-merger
Browse files

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 5240e718 

am: 5f8f0c8b -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1 9d5a28a5 is in history

Change-Id: I03fe1c7c5a372fd126e9885a4412c2b63b138751
parents fa24cbf0 5f8f0c8b
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