tree 2258374d56fdb6296695ef831655c3d29c60b039
parent dd6543e4e82c8c77c752104c43fb3af718df785f
parent 9ed07e3eee75a850f16e2cff7352c062f72f06b8
author Mark Salyzyn <salyzyn@google.com> 1447429020 +0000
committer android-build-merger <android-build-merger@google.com> 1447429020 +0000

Merge "liblog: resolve deadlocks" am: 5559f1d6e8 am: 650a06e01b
am: 9ed07e3eee

* commit '9ed07e3eee75a850f16e2cff7352c062f72f06b8':
  liblog: resolve deadlocks