tree b4e2d0931b76edcb577b7075f8f0b8a2dedc11fe
parent d1188696c7569f1abb1abeca68611c5e1f31c799
parent 5d53c06967da74189935063f7a75da6719a9c733
author Christopher Ferris <cferris@google.com> 1440120231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440120231 +0000

am 5d53c069: am 21499444: am 00376b4d: Avoid a harmless potential integer overflow in png_XYZ_from_xy().

* commit '5d53c06967da74189935063f7a75da6719a9c733':
  Avoid a harmless potential integer overflow in png_XYZ_from_xy().