tree 45d2108fa1ba0e5825fda910a283938554d337ba
parent 7c3d09c2f3524e546989125d75f7944f280fc6fe
parent 605241984cc41f62e2f2e005865d7afed504a972
author Tao Bao <tbao@google.com> 1442021089 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442021089 +0000

am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."

* commit '605241984cc41f62e2f2e005865d7afed504a972':
  recovery: Remove redirect_stdio() when calling ShowFile().