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