OSDN Git Service

am 67f36a8e: resolved conflicts for 76b704e3 to lmp-mr1-dev
authorWonsik Kim <wonsik@google.com>
Mon, 14 Sep 2015 19:39:14 +0000 (19:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Sep 2015 19:39:14 +0000 (19:39 +0000)
commitc53328a55427224dd42534d2b500728e38a83ca2
tree0c22425637efc13275435df057e6bfa2c0beb48b
parentb57ffbb5486a58e0dbb03466e9f3a5e51d6cf0f3
parent67f36a8e6130f5c22ab177b0d29f5705e86daca2
am 67f36a8e: resolved conflicts for 76b704e3 to lmp-mr1-dev

* commit '67f36a8e6130f5c22ab177b0d29f5705e86daca2':
  DO NOT MERGE: Protect data source access with mutex during disconnect