tree 8273a226bb67ae2cababe2168229c9c562fc363d
parent b1d2b51c4652ecdea907a5a6865d55a9bc52c6a2
parent 6eafba6bba3a4949cf3807ea39d5c1e969bebc52
author Glenn Kasten <gkasten@android.com> 1398972565 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398972565 +0000

am 6eafba6b: Merge "Temporary workaround for log spam"

* commit '6eafba6bba3a4949cf3807ea39d5c1e969bebc52':
  Temporary workaround for log spam