tree 0859a3b4fcf443a194f3c36c3ac48fc072ec5e20
parent 4c7c2f73af773872faf5a65167d74900865d96ba
parent 4bc980626c1cf6f1ea7d36e4b54e0023c896c9de
author Doug Zongker <dougz@android.com> 1283538050 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283538050 -0700

am 4bc98062: add --show_text option to recovery

Merge commit '4bc980626c1cf6f1ea7d36e4b54e0023c896c9de' into gingerbread-plus-aosp

* commit '4bc980626c1cf6f1ea7d36e4b54e0023c896c9de':
  add --show_text option to recovery