OSDN Git Service

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

Change-Id: I976218ca4bccaff64195deccb627d3f6369b22c4


Trivial merge