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:22:26 +0000 (12:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 May 2019 19:22:26 +0000 (12:22 -0700)
am: 2685a77b62 -s ours
am skip reason: subject contains skip directive

Change-Id: I5e96cb704542fca1b942f764b5372741bc858c7b


Trivial merge