OSDN Git Service

[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding...
authorMyles Watson <mylesgw@google.com>
Fri, 10 May 2019 19:03:13 +0000 (12:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 May 2019 19:03:13 +0000 (12:03 -0700)
am: 6479bff4cf -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1 c0c3804acd is in history

Change-Id: I0e3438cb5090abcb65e4863ff725db2fe8b35f30


Trivial merge