Merge "Combined motion compensation with scaled predictors" into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 27 Feb 2013 17:46:12 +0000 (09:46 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 27 Feb 2013 17:46:12 +0000 (09:46 -0800)

Trivial merge