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

* commit '8a8ae43b08b6a9ec0fb9307dc6f2995f7efb9017':