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:01:54 +0000 (12:01 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 May 2019 19:01:54 +0000 (12:01 -0700)
am: 7316c97cd1 -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1 c0c3804acd is in history

Change-Id: If63f87a0300606a903bc8f7e9af6fb8e0ad708fd


Trivial merge