tree 6299c388fa18f3236f3bbf678158d7ef93ba4ae8
parent c31ecb72f0ee2e18e9746f382b16a8723f1a68b8
parent 19877de513a9493dad77488144089b4f30103b74
author John Reck <jreck@android.com> 1377624641 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377624641 -0700

am 19877de5: am 5c4e1dac: Merge "Update libpng API usage"

* commit '19877de513a9493dad77488144089b4f30103b74':
  Update libpng API usage