tree 931628d9eb0c121d56ded925656a4cc9bee61e81
parent bfc0e37ab3c5ab2c1994c092230fe05b6c464854
parent 349bae6757b99355d5740068187be29ca8d7992b
author Ugo Yu <ugoyu@google.com> 1549658308 -0800
committer android-build-merger <android-build-merger@google.com> 1549658308 -0800

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: eed34e2782 -s ours
am: 349bae6757 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 35c4572dc0 is in history

Change-Id: Iaf7c1aadcfd65ed6a82b0c3bc98ff121046f70d2