Merge "Provide information on codec controls"
authorYaowu Xu <yaowu@google.com>
Fri, 13 Mar 2015 22:39:07 +0000 (15:39 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 13 Mar 2015 22:39:07 +0000 (15:39 -0700)

Trivial merge