tree a428040e29bc3f4394559bdcc541a8fa9ffc7a9e
parent 48e818344250324ad89cacd23105a8035287d33b
parent 85516e9d019a7f5af0e394ea767185c12ffbcd42
author Colin Cross <ccross@android.com> 1392070791 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392070791 +0000

am 85516e9d: Merge "log: add compile-time checking when ALOGV is disabled"

* commit '85516e9d019a7f5af0e394ea767185c12ffbcd42':
  log: add compile-time checking when ALOGV is disabled