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)
commitfb199e7a56566ea547234136f1c96fa92d180e2c
tree3912b127acc8b1240c3b5219f1fc0818543b9a89
parent9351561a1b9aaf5a5b76c5dd724f2c80e76270c9
parent5980eefcfb684c4f2006be9a767d90fce99973c0
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: 99495df519 -s ours am: 8d550cccd6 -s ours am: 8500500386 -s ours
am: 5980eefcfb -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 dc14eb8ba0 is in history

Change-Id: Ie6310a5c45da530dec6face297e14bb544314a87