tree a2a217e4c6ee066fdf0020491217ace6a556d4a1
parent 08879050120ae49b7fe2fe0cfcb1d9be6f473fb5
parent 6d0473ee9faf6a6e245e83088db91cd993e8facb
author Wonsik Kim <wonsik@google.com> 1442279865 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442279865 +0000

am 6d0473ee: am b26249b7: resolved conflicts for 421977ae to mnc-dev

* commit '6d0473ee9faf6a6e245e83088db91cd993e8facb':
  DO NOT MERGE: Protect data source access with mutex during disconnect