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