Merge "Use lookup table to find pixel numbers in block"
authorJingning Han <jingning@google.com>
Thu, 8 Jan 2015 21:58:35 +0000 (13:58 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 8 Jan 2015 21:58:35 +0000 (13:58 -0800)

Trivial merge