tree e0d91a166486805affa71e8cb1b92fa073b06776
parent 49c3ee764014ada44bc2a66a471a6e7c6ad58593
parent 90b4233a7db64ebec5c45e589ba8847096982eed
author John Reck <jreck@android.com> 1400173510 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400173510 +0000

am 90b4233a: Merge changes I3aa6d877,I76e81e7f

* commit '90b4233a7db64ebec5c45e589ba8847096982eed':
  libpng 1.6.10 - Merge seekable png patch
  Update libpng from 1.6.3 to 1.6.10