tree d89209074dd0de8142c11ec64acbb00452a8a8e8
parent 19bbf92de92ad9dbfb26b3a94025bf6e6cb72cee
parent 3b8de6705bb5c77b6f459fd6dd394ef606228a05
author Mark Salyzyn <salyzyn@google.com> 1394825058 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394825058 +0000

am 3b8de670: Merge "liblog: Build Breakage in sdk(linux)"

* commit '3b8de6705bb5c77b6f459fd6dd394ef606228a05':
  liblog: Build Breakage in sdk(linux)