tree e148dbcc720fb581f48f956407e2b94fc0b8aec6
parent 16f9a4cb3024b600733eafaf841f76ac70ba881a
parent 8a9c5a1de95ee2cb19b57c811723d32d7f770c67
author Wei Jia <wjia@google.com> 1440033354 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440033354 +0000

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

* commit '8a9c5a1de95ee2cb19b57c811723d32d7f770c67':
  Disable bilinear_predict4x4_neon