tree 5efb9590eae974feb7b6c8496e9256a5f36b8631
parent 218524778a02ef53a74dcdbd17923441c3d90305
parent dd91052639b8c38d9fd6f3632fa4cc4243bdeeeb
author Mark Salyzyn <salyzyn@google.com> 1399068132 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399068132 +0000

am dd910526: am 6c37d59e: Merge "logd: turn on -Werror"

* commit 'dd91052639b8c38d9fd6f3632fa4cc4243bdeeeb':
  logd: turn on -Werror