tree 7227fbcb7ae227721070c8446cfe5522d0a7f73e
parent 7954eb0a466ac502d51e3424999f437731d90f49
parent 3cd33a722543a6da22c6dd70b700d27e7890e2b7
author Elliott Hughes <enh@google.com> 1437503327 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437503327 +0000

am 3cd33a72: am 5208d551: Merge "adb: logging: newlines, thread ids, error code overwriting"

* commit '3cd33a722543a6da22c6dd70b700d27e7890e2b7':
  adb: logging: newlines, thread ids, error code overwriting