am 58b136cb: Merge "logcat: continue where we left off"

* commit '58b136cbebe8526134ea9d7e89835b523f1cbe2e':
  logcat: continue where we left off