tree e0a2f962cd9ae8b161ea3aaa434da1ba090531d2
parent 5fc83065f6d7f6277cbaa58570c8bfd22456a003
parent 123c7241b1af01d22b0f28d28bf3095fe496b79d
author Colin Cross <ccross@android.com> 1443649144 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443649144 +0000

am 123c7241: Merge "libpng: turn off warnings"

* commit '123c7241b1af01d22b0f28d28bf3095fe496b79d':
  libpng: turn off warnings