tree 6299c388fa18f3236f3bbf678158d7ef93ba4ae8
parent 239ac6abac4524be93fce710360c0512c6cc2ab3
parent 5c4e1dac0bd8f31559bd50eec4343b7a17b7a976
author John Reck <jreck@android.com> 1377622445 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377622445 -0700

am 5c4e1dac: Merge "Update libpng API usage"

* commit '5c4e1dac0bd8f31559bd50eec4343b7a17b7a976':
  Update libpng API usage