Merge "Support multiple codecs in test infrastructure" into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 23 Jan 2013 22:52:22 +0000 (14:52 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 23 Jan 2013 22:52:22 +0000 (14:52 -0800)

Trivial merge