tree 61ce63e76d91ed977ca411dc606a032ec0e42b1f
parent e96107d2c721043e274fe83828f6d34b720163ad
parent dcf0db2c568c7e85b913b97c3798a18289c84806
author Narayan Kamath <narayan@google.com> 1429875417 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429875417 +0000

am dcf0db2c: (-s ours) Backport fix of buffer overwrite in png_build_index. DO NOT MERGE

* commit 'dcf0db2c568c7e85b913b97c3798a18289c84806':
  Backport fix of buffer overwrite in png_build_index. DO NOT MERGE