| commit | c53328a55427224dd42534d2b500728e38a83ca2 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Mon Sep 14 19:39:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 14 19:39:14 2015 +0000 |
| tree | 0c22425637efc13275435df057e6bfa2c0beb48b | |
| parent | b57ffbb5486a58e0dbb03466e9f3a5e51d6cf0f3 [diff] | |
| parent | 67f36a8e6130f5c22ab177b0d29f5705e86daca2 [diff] |
am 67f36a8e: resolved conflicts for 76b704e3 to lmp-mr1-dev * commit '67f36a8e6130f5c22ab177b0d29f5705e86daca2': DO NOT MERGE: Protect data source access with mutex during disconnect