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

Merge commit 'e3b153146aae6495cdee6713c2d752383e52b9e5'

* commit 'e3b153146aae6495cdee6713c2d752383e52b9e5':
  Fix corrupted image.
tree: 6c630b50ab4bfd863522c4de9d181c38115b513d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE