tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent f8ab5bdba6b1ea752d705ec26c13af3c7365a500
parent d33e21a7ae7b37590ad41fac56f87141c597616c
author Tao Bao <tbao@google.com> 1440684826 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684826 +0000

am d33e21a7: am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."

* commit 'd33e21a7ae7b37590ad41fac56f87141c597616c':