Merge "Add a codec control option to tune for screen content."
authorAlex Converse <aconverse@google.com>
Wed, 6 Aug 2014 17:30:40 +0000 (10:30 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 6 Aug 2014 17:30:40 +0000 (10:30 -0700)

Trivial merge