tree 0f1ad1e6c74a7b96301c5a38243676e926675bfc
parent 35c4572dc0fe05fbe7d3a68b2391eba267ee2245
author Myles Watson <mylesgw@google.com> 1556735506 +0000
committer Myles Watson <mylesgw@google.com> 1556735506 +0000

Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

This reverts commit 35c4572dc0fe05fbe7d3a68b2391eba267ee2245.

Bug: 79703832
Bug: 130553855
Reason for revert: Regression with cross-key pairing

Change-Id: If8652936eb3b24b3d1b3fded0be200bb986b70e3