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

* commit '07c50b02d70f69a1f6cd2eb1272734c593c93ee8':
  logcat: continue where we left off