am 986c28ff: (-s ours) am 18243b3e: Relax modf(Inf) fractional part verification
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:37 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:37 +0000 (10:45 +0000)
* commit '986c28ff00fe5b943d31c36a32b0cc424c3ea77c':


Trivial merge