Merge "fixes --disable-vp9-encoder" into vp9-preview
authorJim Bankoski <jimbankoski@google.com>
Mon, 3 Dec 2012 20:41:30 +0000 (12:41 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 3 Dec 2012 20:41:31 +0000 (12:41 -0800)

Trivial merge