tree 94c27e4b5c4fe20378267bba3155953da88c2294
parent f6cba431efa5b921e650dcbf661d3313e96d214b
parent 50906c2278f3dbd5bedf968deefe0697f5ef7aae
author Elliott Hughes <enh@google.com> 1417722735 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417722735 +0000

am 50906c22: Merge "libjpeg should #define __ARM_HAVE_NEON."

* commit '50906c2278f3dbd5bedf968deefe0697f5ef7aae':
  libjpeg should #define __ARM_HAVE_NEON.