tree 38e3f978c720c08607a9a4128b46f48d9b2391b1
parent 7b81f64c8315ead539c7955fbc790e7596376119
parent 791d8f2ed98581c67bf9c1ad56d3140719c1882a
author Eric Vannier <evannier@google.com> 1311956646 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311956646 -0700

am 791d8f2e: Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE

* commit '791d8f2ed98581c67bf9c1ad56d3140719c1882a':
  Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE