tree 0e5b9f64a4df3eb3e02c6e5c4a547c14c592fcec
parent d8424130792dccacab1f642f15bd62690b68d989
parent 618cae955e32fd4d7ede9a3e979e68ca8d663f15
author Neil Fuller <nfuller@google.com> 1414383671 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414383671 +0000

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

* commit '618cae955e32fd4d7ede9a3e979e68ca8d663f15':