tree 3aebd8b4a976d5deb7fad3600ee77d47ee339f0f
parent 486aa290635dbf6f60b3435694951fed3470ffdf
parent f93d8166ef4c06f6ad71293ffa8a4ce469df4fa5
author Doug Zongker <dougz@android.com> 1253669299 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253669299 -0700

am f93d8166: confirm before wiping user data in recovery

Merge commit 'f93d8166ef4c06f6ad71293ffa8a4ce469df4fa5' into eclair-plus-aosp

* commit 'f93d8166ef4c06f6ad71293ffa8a4ce469df4fa5':
  confirm before wiping user data in recovery