Merge "convolve_test: Fix high bit depth IOC runtime errors."
authorJames Zern <jzern@google.com>
Fri, 13 May 2016 17:56:41 +0000 (17:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 13 May 2016 17:56:41 +0000 (17:56 +0000)

Trivial merge