Merge "Don't override active_worst_quality in 2 pass"
authorJohn Koleszar <jkoleszar@google.com>
Fri, 6 May 2011 15:59:05 +0000 (08:59 -0700)
committerCode Review <code-review@webmproject.org>
Fri, 6 May 2011 15:59:05 +0000 (08:59 -0700)

Trivial merge