tree f64cf25aaec03d8a835888610007c526c3e24afb
parent 538a75a36cb1eb6044b2f7ea21bbd0cc3d1b1aa1
parent df9ea768e88feedb40a0c27b0ab7b12550f54b2a
author Narayan Kamath <narayan@google.com> 1429897656 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429897656 +0000

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

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