Merge "Use deFloatIsNaN, not isnan."
authorDan Albert <danalbert@google.com>
Thu, 9 Feb 2017 21:32:24 +0000 (21:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Feb 2017 21:32:24 +0000 (21:32 +0000)
am: 4e49222745

Change-Id: Ic40964ffc3019a3bc4b1e4f80e4a5a73a105905f


Trivial merge