tree 93f6961482458f9b638f0e34410be3c4d6c92454
parent 0af2d2d2e31cc119bf7f321bd8209f121f0a626c
parent 6b463b49c69ab8656e2b213dcea16fbc71664619
author Romain Guy <romainguy@android.com> 1258057809 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258057809 -0800

am 6b463b49: am f12de9f5: Fix corrupted image.

Merge commit '6b463b49c69ab8656e2b213dcea16fbc71664619' into eclair-mr2-plus-aosp

* commit '6b463b49c69ab8656e2b213dcea16fbc71664619':
  Fix corrupted image.