Merge "Align image buffer in multiple-resolution encoder"
authorYunqing Wang <yunqingwang@google.com>
Tue, 13 Dec 2011 18:39:44 +0000 (10:39 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 13 Dec 2011 18:39:44 +0000 (10:39 -0800)

Trivial merge