tree 76ad2c757647232039fab48936245b91c3ab1a2b
parent 1d270542628ac15e958b8ae5a83736606d9ce23e
parent 31815b81c9cdbfbb6075e8827ed6c9a1b5d06730
author Ugo Yu <ugoyu@google.com> 1559697182 -0700
committer android-build-merger <android-build-merger@google.com> 1559697182 -0700

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

Change-Id: Ic22afab361dac6bbdde1f7c792886197b62d873d