Merge "Replacing asm 16x16 variance calculation with intrinsics."
authorDmitry Kovalev <dkovalev@google.com>
Thu, 4 Sep 2014 01:57:33 +0000 (18:57 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 4 Sep 2014 01:57:33 +0000 (18:57 -0700)

Trivial merge