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

Change-Id: Iddbd61d74fa3223c92f12482453af3907af44cf2


Trivial merge