| commit | 4085f4d52cc2c95008ab447514fefaa884853b7a | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Mon Nov 04 21:53:52 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 04 21:53:52 2013 -0800 |
| tree | 695c0281ca1534d9ee102138fb7c223a957b8a12 | |
| parent | a0b2c0398e4bd9ed5f57d39296afc56950fc02c4 [diff] | |
| parent | 7efa9bf53b67622b77bb949e849127f65357d75a [diff] |
am 7efa9bf5: am 3e7495b2: Merge "Fix crashes for images that are not PNG or JPEG" into klp-dev * commit '7efa9bf53b67622b77bb949e849127f65357d75a': Fix crashes for images that are not PNG or JPEG