| commit | b1617f35efad37e624f6fea4e6147d9f2db0b332 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed Dec 23 18:16:33 2015 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 23 18:16:33 2015 -0800 |
| tree | 7855602a63d58798df6366dd5b5ac9c97891c7ba | |
| parent | 2475d21368689ebdc9a61660cae140cb85cdddb8 [diff] | |
| parent | e5646f90c21cd7dd5c16f239666090b5ae54e966 [diff] |
Merge "liblog: resolve deadlocks" am: 8f8a88cad3 am: 247e22090a am: e5646f90c2 * commit 'e5646f90c21cd7dd5c16f239666090b5ae54e966':