tree 1f144afbfb6f4368fcde835a84d008a77230ccd6
parent e94e89187d555da4313bef6f3b3167129825837d
parent 3a3f287b7bae2d3e3a8328b3b82e2ccf1df096a0
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575416385 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575416385 +0000

Merge "SDP: add return after SDP disconnection" into oc-dev am: 1198e30b5d am: 76f6f74a32 am: 3a3f287b7b

Change-Id: I8aefeefb2a55d3548d47b10dab533bc7bff704f9