tree 166fa5afeed341e2685091c89d9d8418acb66e5d
parent 08300f2eb3a7e8539cddb5f5612ca46126f2661f
parent ba04201f582478b45e403d3197db679e9d8786c7
author Elliott Hughes <enh@google.com> 1473289972 +0000
committer android-build-merger <android-build-merger@google.com> 1473289972 +0000

Merge "Fix sscanf/wcstod parsing of NaNs." am: 8327a1707b
am: ba04201f58

Change-Id: I74b822b0249522e2e241661b99aa38af36212bb9