tree 56a694f0fbf868e01603654e7963dc480a629f10
parent 09aa2f9b2c34339878dfd218d1c6e09644a108b0
parent 247e22090ad2f31423c59f97f70420cbee21edf9
author Mark Salyzyn <salyzyn@google.com> 1447973513 +0000
committer android-build-merger <android-build-merger@google.com> 1447973513 +0000

Merge "liblog: resolve deadlocks" am: 8f8a88cad3
am: 247e22090a

* commit '247e22090ad2f31423c59f97f70420cbee21edf9':
  liblog: resolve deadlocks