tree f8ffe92bf7804551c2d65120ad8581dce2036310
parent 9edf2744bed5ab0badda65b0d0a5a6b8b22554d2
author Robert Shih <robertshih@google.com> 1441227767 -0700
committer The Android Automerger <android-build@android.com> 1445454461 -0700

DO NOT MERGE: Protect data source access with mutex during disconnect

Bug: 23658148
Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd

Resolved conflicts from cherry-picking ag/764007 into the lmp-mr1-release branch.