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

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

[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am: 3bf41c03
am: 6479bff4 -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1 c0c3804a is in history

Change-Id: I0e3438cb5090abcb65e4863ff725db2fe8b35f30
parents 6d827a4b 6479bff4
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