tree 42f9caa235a058a36b9b727fb8c11c4fb6a6544b
parent ba64f0b0a5836f4245beba5b8ea1efa2965451ac
parent a162a86accfb8213da7a67e86c15fcf6d1df21e1
author Elliott Hughes <enh@google.com> 1377905217 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377905217 -0700

am a162a86a: Merge "Fix the build when logging is enabled."

* commit 'a162a86accfb8213da7a67e86c15fcf6d1df21e1':
  Fix the build when logging is enabled.