tree 880ccbef1857e74c9f08cca54e03954cecacb3f9
parent 47de95fe594e337f7837603bf55177e7038546ea
parent c4d132a6048b379cf65d1a9840ff65ed32cd4058
author Myles Watson <mylesgw@google.com> 1557515260 -0700
committer android-build-merger <android-build-merger@google.com> 1557515260 -0700

[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am: 50e6566d98 am: 280465888c -s ours
am: c4d132a604 -s ours
am skip reason: subject contains skip directive

Change-Id: Iff03c5de4fab55d3bc54812f776040464011ac9e