tree e0d91a166486805affa71e8cb1b92fa073b06776
parent d28dcc059e8650116709d602f581fa6e687f06ad
parent 04f0b19899c66ffeadf74a7b9a6f404aef905b79
author John Reck <jreck@android.com> 1400884858 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400884858 +0000

am 04f0b198: Merge "Revert "libpng 1.6.10 enable NEON Optimizations""

* commit '04f0b19899c66ffeadf74a7b9a6f404aef905b79':
  Revert "libpng 1.6.10 enable NEON Optimizations"