tree 6831949014e0016fffd79b5b3f1de89902ff62f8
parent 825dd0c95ae50ed3247c4593c0808d062aae09ec
parent 7acebabfedea522f08376096754800570f2c28e2
author Narayan Kamath <narayan@google.com> 1391188715 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391188715 +0000

am 7acebabf: (-s ours) Merge "Make png_uint_32 32 bits wide on all platforms."

* commit '7acebabfedea522f08376096754800570f2c28e2':
  Make png_uint_32 32 bits wide on all platforms.