Merge "Allow DC/H/V/TM on screen content."
authorAlex Converse <aconverse@google.com>
Fri, 21 Nov 2014 17:38:39 +0000 (09:38 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 21 Nov 2014 17:38:39 +0000 (09:38 -0800)

Trivial merge