tree d7c35f13c6ace0875a8f43804b3c9499749e9779
parent 25a67fde9fe5ebaeb79dbb3edf0fc4857adf5da2
parent 77a2c8839f2de5947184605815015bc2696c3207
author Elliott Hughes <enh@google.com> 1430972756 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430972756 +0000

am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."

* commit '77a2c8839f2de5947184605815015bc2696c3207':
  Add an alternate screen for viewing recovery logs.