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)
commit4f856e1999fc6ab5a123a27fb424caeb29a88c0f
tree34129751dfefc8077be8a2fad7de2da9e290dae9
parentb7a196ddd84baa589704b7be8a2b68dd58fccec0
parent2685a77b6261406931a7e90129a80775d972bc75
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am: 3bf41c03e0 am: 6479bff4cf -s ours am: 743f7856b2 -s ours
am: 2685a77b62 -s ours
am skip reason: subject contains skip directive

Change-Id: I5e96cb704542fca1b942f764b5372741bc858c7b