tree d7c35f13c6ace0875a8f43804b3c9499749e9779
parent 31cfeeb9bfbd82f76106f58640ffdf5999a28dce
parent 81ad2bf86354638cfe5d7fa1eeb84882d69be19d
author Elliott Hughes <enh@google.com> 1431019143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431019143 +0000

am 81ad2bf8: am 3257155e: am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."

* commit '81ad2bf86354638cfe5d7fa1eeb84882d69be19d':
  Add an alternate screen for viewing recovery logs.