OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state...
authorUgo Yu <ugoyu@google.com>
Wed, 5 Jun 2019 08:14:45 +0000 (01:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 08:14:45 +0000 (01:14 -0700)
commit8c379d3079675b349e32a3f86ac7e94e8421d95b
tree9dccf41c58b1a478d55aaf3367404de4c21abf42
parentf86ad401ca7557112df54c933a84c05e3d6eade3
parent2689c11a34751f42c4e404cf45eb68fa837ee647
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: b751ea3a90 am: 2b3330a139 -s ours am: d9997755f9 -s ours am: 0f3b13b40e -s ours am: a2185db6d3 -s ours
am: 2689c11a34 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1 9d5a28a536 is in history

Change-Id: Id68c9eaffca892fa995fa723bf2232e71d5ff97f