tree 3d6254805d09a8ffc9e59e6be03bdcb45e399b18
parent 8556cba596a23cabb480f587e4bf696bd64ca9ba
parent 47de95fe594e337f7837603bf55177e7038546ea
author Myles Watson <mylesgw@google.com> 1557516112 -0700
committer android-build-merger <android-build-merger@google.com> 1557516112 -0700

[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: 0fb39a1188 am: 3ad36be23b -s ours am: f57a65ed3b -s ours
am: 47de95fe59 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib8e3671ae80e0c870b8867e2bbfac831c97367b5