am 7f95ab17: am 48ee3b67: (-s ours) am 31805e60: Fix warning in modf() precision...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:43 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:43 +0000 (14:46 +0000)
* commit '7f95ab172137942d2d27b8f1823630d6e8fb4239':


Trivial merge