OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state...
authorUgo Yu <ugoyu@google.com>
Wed, 5 Jun 2019 01:13:02 +0000 (18:13 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 01:13:02 +0000 (18:13 -0700)
am: cc98ca6dd2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic22afab361dac6bbdde1f7c792886197b62d873d


Trivial merge