am 48ee3b67: (-s ours) am 31805e60: Fix warning in modf() precision test code
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:42 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:42 +0000 (10:45 +0000)
* commit '48ee3b676a50fec59dd6b6fc46365c36639801ee':


Trivial merge