tree 1a4975273b0496b5373730ef4262dfa4ddb31a12
parent e42e9db3143f819e19684d4f882ef3834454a44d
parent 85629953f54603d660f932bebf2c26a009aec380
author Mark Salyzyn <salyzyn@google.com> 1394825203 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394825203 +0000

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

* commit '85629953f54603d660f932bebf2c26a009aec380':
  liblog: Build Breakage in sdk(linux)