Merge "Fix in bit-shift operation for highbitdepth decode"
authorDeb Mukherjee <debargha@google.com>
Thu, 16 Oct 2014 16:23:57 +0000 (09:23 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 16 Oct 2014 16:23:57 +0000 (09:23 -0700)

Trivial merge