Merge "Fix potential overflow issue in hadamard_16x16()"
authorJingning Han <jingning@google.com>
Fri, 12 Jun 2015 19:03:20 +0000 (19:03 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 12 Jun 2015 19:03:21 +0000 (19:03 +0000)

Trivial merge