diff options
author | Nick Kralevich <nnk@google.com> | 2015-04-14 03:16:55 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-14 03:16:55 +0000 |
commit | 5a8ffb9b0aea5d9a012dabe3596aba1d3d652638 (patch) | |
tree | f64cf25aaec03d8a835888610007c526c3e24afb | |
parent | a831a9ca13f2dcbe4fb6c63346d9b7788a46b6fc (diff) | |
parent | 538a75a36cb1eb6044b2f7ea21bbd0cc3d1b1aa1 (diff) | |
download | libpng-5a8ffb9b0aea5d9a012dabe3596aba1d3d652638.tar.gz |
am 538a75a3: am e96107d2: am 31f04ea9: (-s ours) Merge "Backport of fix for CVE-2015-0973 to libpng 1.2." into klp-dev
* commit '538a75a36cb1eb6044b2f7ea21bbd0cc3d1b1aa1':
Backport of fix for CVE-2015-0973 to libpng 1.2.
0 files changed, 0 insertions, 0 deletions