tree 3aebd8b4a976d5deb7fad3600ee77d47ee339f0f
parent 83a25d7380d0d27c8b7eae02b0d0e339c88d71ce
parent 8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d
author Doug Zongker <dougz@android.com> 1253893547 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253893547 -0700

am 8f8bc4cb: am f93d8166: confirm before wiping user data in recovery

Merge commit '8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d'

* commit '8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d':
  confirm before wiping user data in recovery