Merge "Parameter fixes for one-pass non-cbr mode"
authorDeb Mukherjee <debargha@google.com>
Thu, 6 Feb 2014 22:31:54 +0000 (14:31 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 6 Feb 2014 22:31:54 +0000 (14:31 -0800)

Trivial merge