tree 7a375165c96b754d82ba1b6c304084645a5197bf
parent 66dce0da6a5db51ee0c2875517d3a6ca6cbbe53d
parent 84d92c718ab9f48faec0f640747c4b6f7a995607
author Eric Vannier <evannier@google.com> 1311730782 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311730782 -0700

am 84d92c71: (-s ours) am 615c9ab0: (-s ours) Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE

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