tree bd85ef78b8130fdd7c809d009e753386bc4e7308
parent e68e4ad7f2ecf45cd7c28c1192eab2059b477dd3
parent 9dbb32694529ff1dd285c5f2fad497ed937a5c44
author Wei Jia <wjia@google.com> 1440033958 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440033958 +0000

am 9dbb3269: am 8a9c5a1d: am 4a94e3b4: am 217c6ceb: Merge commit \'efc44fee\' into HEAD

* commit '9dbb32694529ff1dd285c5f2fad497ed937a5c44':
  Disable bilinear_predict4x4_neon