Merge "Remove __ARM_HAVE_VFP."
authorElliott Hughes <enh@google.com>
Thu, 4 Dec 2014 01:11:08 +0000 (01:11 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 4 Dec 2014 01:11:09 +0000 (01:11 +0000)

Trivial merge