tree a09231d3ba4bd8943ad2d4d00726fd0b6a6a929e
parent a7f915b4d8845fe559124dc055e59cfc094698f9
parent fc93180fb22e9ef8f32a5f15900f2b12337d26e6
author Michael Jurka <mikejurka@google.com> 1392411640 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411640 +0000

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

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