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

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

[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: cd7bdf4c
am: 7316c97c -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1 c0c3804a is in history

Change-Id: If63f87a0300606a903bc8f7e9af6fb8e0ad708fd
parents d7a673d4 7316c97c
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