Merge "hadamard 8x8 test"
authorJohann Koenig <johannkoenig@chromium.org>
Fri, 22 Apr 2016 04:36:10 +0000 (04:36 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 22 Apr 2016 04:36:10 +0000 (04:36 +0000)

Trivial merge