tree 0b9a383fa279468972257b4754b56ad3aeed46f8
parent 5e3589da14367d34791c146cce87522e7fc3be5a
parent 8f8a88cad334a630d6325672a7c6a32a0769a783
author Mark Salyzyn <salyzyn@google.com> 1447973138 +0000
committer android-build-merger <android-build-merger@google.com> 1447973138 +0000

Merge "liblog: resolve deadlocks"
am: 8f8a88cad3

* commit '8f8a88cad334a630d6325672a7c6a32a0769a783':
  liblog: resolve deadlocks