diff options
| author | Geremy Condra <gcondra@google.com> | 2012-04-12 10:41:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-12 10:41:16 -0700 |
| commit | 9dddf651ebc622db16467626ae0f5995d11e246f (patch) | |
| tree | 1257afdb6b0568634b4d31f9d993579e8c4ac851 /Android.mk | |
| parent | 34efb3d5dcb9d1c7552725702ba2cfc905b4c39a (diff) | |
| parent | e21460858932813a0873f96e1ddc2bc6f36d7c56 (diff) | |
| download | external_libpng-9dddf651ebc622db16467626ae0f5995d11e246f.zip external_libpng-9dddf651ebc622db16467626ae0f5995d11e246f.tar.gz external_libpng-9dddf651ebc622db16467626ae0f5995d11e246f.tar.bz2 | |
am e2146085: (-s ours) am b4e0b528: (-s ours) Merge "DO NOT MERGE Fix for CVE-2011-3045" into ics-mr1
* commit 'e21460858932813a0873f96e1ddc2bc6f36d7c56':
DO NOT MERGE Fix for CVE-2011-3045
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions