Commit 0f3b13b4 authored by Ugo Yu's avatar Ugo Yu Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding... 

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: b751ea3a am: 2b3330a1 -s ours
am: d9997755 -s ours
am skip reason: subject contains skip directive

Change-Id: Idcf3e6f5276592b17693e89c8a56b37c7b445688
parents 1c2cf084 d9997755
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