tree c9430f416a35ef2f25b457ce4a569b2d77d863eb
parent d7797521f312697a8947938056b2f3807009a92c
parent 9789c42eab81e03ceae50be08ef0eeb6009b795e
author Michael Jurka <mikejurka@google.com> 1383213954 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383213954 -0700

am 9789c42e: Fix crashes for images that are not PNG or JPEG

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