Merge "Enforce max-intra-pct in one-pass cbr mode"
authorDeb Mukherjee <debargha@google.com>
Fri, 14 Feb 2014 23:53:19 +0000 (15:53 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 14 Feb 2014 23:53:19 +0000 (15:53 -0800)

Trivial merge