| commit | 0e6ca7067928677e36391fa2e53f5969e39c9993 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Aug 12 20:36:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 12 20:36:52 2014 +0000 |
| tree | d1f581c15aee8ce5e9af6d94021fe02b23bb1d05 | |
| parent | 48765a56a132cbe68b7717a2d79dea3c347ffe61 [diff] | |
| parent | 165e4d220202ed386e5b7ebf3a6bde0d335eb227 [diff] |
am 165e4d22: resolved conflicts for merge of e4ec1e94 to lmp-dev-plus-aosp * commit '165e4d220202ed386e5b7ebf3a6bde0d335eb227': logd: persistent reader threads