Merge "Fix intermediate height in convolve_c"
authorJames Zern <jzern@google.com>
Tue, 3 Sep 2013 22:50:33 +0000 (15:50 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 3 Sep 2013 22:50:33 +0000 (15:50 -0700)

Trivial merge