tree f64cf25aaec03d8a835888610007c526c3e24afb
parent f529a3cf6246fd6c884faba2a1c9f6e139d7b331
parent 549b976132cd82ac53c7bd200496f09f3c50863e
author Narayan Kamath <narayan@google.com> 1424956115 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424956115 +0000

am 549b9761: Merge "Restore a width check that was removed from png.c (CVE-2015-0973)"

* commit '549b976132cd82ac53c7bd200496f09f3c50863e':
  Restore a width check that was removed from png.c (CVE-2015-0973)