tree 0e5b9f64a4df3eb3e02c6e5c4a547c14c592fcec
parent fe2d9deaa16a63759631f0fe193da8f5ff8ef766
parent 5bb0152da4447e94bc3859092f4d0f8c3642e30e
author Neil Fuller <nfuller@google.com> 1414384439 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414384439 +0000

am 5bb0152d: am 618cae95: am 597fe138: Merge "Remove dependencies on FloatMath"

* commit '5bb0152da4447e94bc3859092f4d0f8c3642e30e':