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)
commit52836e996324835daf7424b67a2febdc23de49e6
tree0870b079fbec98605ca1b265716b33f939ec7f9b
parent14fa281af52df56d5fb237a01083230ec9cdf869
parentdc3ea8739a859ca84d2cdfd341174adef19f02cb
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev am: bff76f0800 -s ours
am: dc3ea8739a -s ours
am skip reason: subject contains skip directive

Change-Id: I976218ca4bccaff64195deccb627d3f6369b22c4