OSDN Git Service

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2...
authorUgo Yu <ugoyu@google.com>
Fri, 8 Feb 2019 20:37:26 +0000 (12:37 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Feb 2019 20:37:26 +0000 (12:37 -0800)
am: a6d6406255 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 f3681c8616 is in history

Change-Id: Ie5679c43d4e59f3028a115558763baae8d31ec73


Trivial merge