Merge "idct32x32_1_add_neon: clear a couple conv warnings"
authorJames Zern <jzern@google.com>
Tue, 1 Nov 2016 22:34:59 +0000 (22:34 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 1 Nov 2016 22:34:59 +0000 (22:34 +0000)

Trivial merge