am 6c0cd1dd: am 6c92369c: Merge "logcat: improve error messages"

* commit '6c0cd1dd4a0a9093540a694a6725ce5e8fbea0e8':
  logcat: improve error messages