Merge "Require armv6/media when building armv7"
authorJohann <johannkoenig@google.com>
Thu, 31 Jul 2014 19:47:38 +0000 (12:47 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 31 Jul 2014 19:47:38 +0000 (12:47 -0700)

Trivial merge