tree 6c630b50ab4bfd863522c4de9d181c38115b513d
parent 54250dc119131935cfe5f76b6cc7a779e8cb14b1
parent e3b153146aae6495cdee6713c2d752383e52b9e5
author Romain Guy <romainguy@android.com> 1258058098 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258058098 -0800

am e3b15314: am 6b463b49: am f12de9f5: Fix corrupted image.

Merge commit 'e3b153146aae6495cdee6713c2d752383e52b9e5'

* commit 'e3b153146aae6495cdee6713c2d752383e52b9e5':
  Fix corrupted image.