Merge "Fix first-pass encoding test" into experimental
authorJingning Han <jingning@google.com>
Thu, 16 May 2013 00:01:04 +0000 (17:01 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 16 May 2013 00:01:04 +0000 (17:01 -0700)

Trivial merge