Merge "Use deFloatIsNaN, not isnan." am: 4e49222745 am: dd33e61339 am: 558bba7fca...
authorDan Albert <danalbert@google.com>
Tue, 22 Aug 2017 20:54:10 +0000 (20:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:54:10 +0000 (20:54 +0000)
am: 46833b6513

Change-Id: Iaed5567d52c2e0ac4c2fcaf5ebf01560c6f8240f


Trivial merge