| commit | 9f64931c68a7594653fff5c8dd8055fa15e385c9 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Tue Sep 15 02:10:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 02:10:45 2015 +0000 |
| tree | 6f9821f13e621911ea9f7adcf7ef962673d70a63 | |
| parent | 686008a0b91242314abfc5c861c74249f6328d90 [diff] | |
| parent | 9d6d6cf58c9dc5d208928ad6c43fcd77de335690 [diff] |
am 9d6d6cf5: am 6d0473ee: am b26249b7: resolved conflicts for 421977ae to mnc-dev * commit '9d6d6cf58c9dc5d208928ad6c43fcd77de335690': DO NOT MERGE: Protect data source access with mutex during disconnect