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