tree 10da860fcff71886af91d082e31f0e1917926848
parent 96da7a7ef3ec33033b759a2e7ba39844fcf8c381
parent b1124ec75f4ecb86a263443652d6bff3af024506
author Michael Jurka <mikejurka@google.com> 1414566316 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566316 +0000

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

* commit 'b1124ec75f4ecb86a263443652d6bff3af024506':