Merge "Disable neon assembly when neon is disabled"
authorJohann <johannkoenig@google.com>
Tue, 9 Dec 2014 20:47:12 +0000 (12:47 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 9 Dec 2014 20:47:12 +0000 (12:47 -0800)

Trivial merge