| commit | 538a75a36cb1eb6044b2f7ea21bbd0cc3d1b1aa1 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Apr 14 02:44:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 14 02:44:27 2015 +0000 |
| tree | f64cf25aaec03d8a835888610007c526c3e24afb | |
| parent | f0c3b9786da1c3248cc8f71caf59a9684a4118ce [diff] | |
| parent | e96107d2c721043e274fe83828f6d34b720163ad [diff] |
am e96107d2: am 31f04ea9: (-s ours) Merge "Backport of fix for CVE-2015-0973 to libpng 1.2." into klp-dev * commit 'e96107d2c721043e274fe83828f6d34b720163ad': Backport of fix for CVE-2015-0973 to libpng 1.2.
