tree a41f21249bc93b946bdfd2c1576f3ad0c5ad961d
parent ab9e1ce005d6b5b8777a8bb9db0fef35891c18a5
parent aea6888b056be21adf762e066c7f33b8939b8a06
author Ian Rogers <irogers@google.com> 1414155710 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414155710 +0000

am aea6888b: Merge "Tidy up logging."

* commit 'aea6888b056be21adf762e066c7f33b8939b8a06':
  Tidy up logging.