tree cba62d0d64153aa2169651696bc238591341d679
parent 1018f8dfc972372c37fae76bc6f63786fa9d8b5a
parent fc93180fb22e9ef8f32a5f15900f2b12337d26e6
author Michael Jurka <mikejurka@google.com> 1414085425 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085425 +0000

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

* commit 'fc93180fb22e9ef8f32a5f15900f2b12337d26e6':