| commit | 7efa9bf53b67622b77bb949e849127f65357d75a | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Sat Nov 02 10:08:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 02 10:08:08 2013 -0700 |
| tree | 7f6c9e1cf02315dd46b3ab446b6f383b83b78cf3 | |
| parent | 06749c2bc878f1359b09c28be2efae87405a923f [diff] | |
| parent | 3e7495b26058d1442c4ed4960818399728e6bc31 [diff] |
am 3e7495b2: Merge "Fix crashes for images that are not PNG or JPEG" into klp-dev * commit '3e7495b26058d1442c4ed4960818399728e6bc31': Fix crashes for images that are not PNG or JPEG