OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state...
authorUgo Yu <ugoyu@google.com>
Fri, 8 Feb 2019 20:47:56 +0000 (12:47 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Feb 2019 20:47:56 +0000 (12:47 -0800)
am: 5980eefcfb -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 dc14eb8ba0 is in history

Change-Id: Ie6310a5c45da530dec6face297e14bb544314a87


Trivial merge