Merge "Disable neon bilinear 4x4"
authorJohann <johannkoenig@google.com>
Tue, 2 Jun 2015 21:44:13 +0000 (21:44 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 2 Jun 2015 21:44:14 +0000 (21:44 +0000)

Trivial merge