am cc07811e: (-s ours) am 3cd33a72: am 5208d551: Merge "adb: logging: newlines, thread ids, error code overwriting"

* commit 'cc07811ebb4f42109ae9ef1414e1a24d8cf54a9d':