OSDN Git Service

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

Change-Id: Ibb02ce20ebe2d1785d8b4b3a5596e4dfae856142


Trivial merge