Merge "Correct HAVE_NEON_ASM define"
authorJohann <johannkoenig@google.com>
Fri, 16 May 2014 23:48:49 +0000 (16:48 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 16 May 2014 23:48:49 +0000 (16:48 -0700)

Trivial merge