tree b4e2d0931b76edcb577b7075f8f0b8a2dedc11fe
parent 532212c944a1cfbe764008cc6638f281041bbb58
parent 16767df804698551950506f8d628a0f6a28bb22f
author Christopher Ferris <cferris@google.com> 1440652334 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652334 +0000

am 16767df8: (-s ours) am 5d53c069: am 21499444: am 00376b4d: Avoid a harmless potential integer overflow in png_XYZ_from_xy().

* commit '16767df804698551950506f8d628a0f6a28bb22f':