OSDN Git Service

[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state...
authorMyles Watson <mylesgw@google.com>
Fri, 10 May 2019 19:07:00 +0000 (12:07 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 May 2019 19:07:00 +0000 (12:07 -0700)
am: 6d827a4be2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ice25049f5b4e398e21345d3f6f69088cd68389cb


Trivial merge