tree a09231d3ba4bd8943ad2d4d00726fd0b6a6a929e
parent 32bbb4f0676ba6f564988557c5ecaea5363c8d2c
parent 14f3109747feafff22a75851349476cf5ae58720
author Michael Jurka <mikejurka@google.com> 1392411170 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411170 +0000

am 14f31097: am 79afbdd4: am 9789c42e: Fix crashes for images that are not PNG or JPEG

* commit '14f3109747feafff22a75851349476cf5ae58720':
  Fix crashes for images that are not PNG or JPEG