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)
commit743f7856b219b8a754507d8ccb76972a1d6a7281
treedebcfa8de7fe06cf129bc7dead57d669ab014ed6
parent6d827a4be2388e197f64ded16159cee35d74140f
parent6479bff4cf3fec27f3323a8aad9ae9eaf3a93abb
[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 skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1 c0c3804acd is in history

Change-Id: I0e3438cb5090abcb65e4863ff725db2fe8b35f30