tree d4d33a8793bc011fa5c8dfbf36b0ee17580094f6
parent 603b8016d775f62d60d721ca43461f4ce88cc581
parent 79afbdd4303f3cd0db1eb963ffc6f00a635ce78b
author Michael Jurka <mikejurka@google.com> 1392410243 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410243 +0000

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

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