tree 7d0f7ca035d28794849b31df6f339e41ce6bee2c
parent a409a6e227d85b2dbe9bf5f04b4dd401b5c5a682
parent ab7fb91df50d77b9458a298dacca4b791c512c87
author Doug Zongker <dougz@android.com> 1285094235 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285094235 -0700

am eb4d5b25: Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread

Merge commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae' into gingerbread-plus-aosp

* commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae':
  recovery just takes a filename as an argument now (do not merge)