tree 7aac6e85dfe15db1d0e9f88f468ad87b3bc0e9bc
parent c6b8225e759d1790d9a38082a18ce7e24a3dba27
parent b4eacebfc5c5fd86b20661eab0797ce70c66e323
author Glenn Kasten <gkasten@android.com> 1398972896 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398972896 +0000

am b4eacebf: am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"

* commit 'b4eacebfc5c5fd86b20661eab0797ce70c66e323':
  Temporary workaround for log spam