tree 8d77fba74918e710aba8a2f791620fb46f39c7f1
parent fa6268cfac65636ae5aa8740ca9b3e5c4b77e1ca
parent b4e8ab7fc58f9d2fdc5f7a2db737022c700058ba
author Brian Carlstrom <bdc@google.com> 1397666477 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397666477 +0000

am b4e8ab7f: Merge changes Ie1194452,I9c42191b,I340deefa,I313493fa,Ia900dab4

* commit 'b4e8ab7fc58f9d2fdc5f7a2db737022c700058ba':
  Use arch-specific flags to fix multilib build.
  Tweak makefile
  Merge seek support from 1.2 to 1.6
  Update libpng to version 1.6.3
  Revert "Make png_uint_32 32 bits wide on all platforms."