am 6b463b49: am f12de9f5: Fix corrupted image.

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

* commit '6b463b49c69ab8656e2b213dcea16fbc71664619':
  Fix corrupted image.