tree 77009b128a87b1a5d61413500b6cc6ed1f196c24
parent 5200114fe8c1c1503176c891230200bf8d5ec632
parent 28cae98c834fb4bc47588b34dc3fe19811d5162b
author Doug Zongker <dougz@android.com> 1283538201 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283538201 -0700

am 28cae98c: am 4bc98062: add --show_text option to recovery

Merge commit '28cae98c834fb4bc47588b34dc3fe19811d5162b'

* commit '28cae98c834fb4bc47588b34dc3fe19811d5162b':
  add --show_text option to recovery