tree 1f8a26e5afc4ec3fd4da0328bb7bf1557fbd5793
parent 0566d8d505b7209e31804a6bd0cb301f5ec7c053
parent 23582d7da022aac190dc86e9536d9e5b45a80220
author Neil Fuller <nfuller@google.com> 1414566501 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566501 +0000

am 23582d7d: am f1340f18: Merge "Remove dependencies on FloatMath"

* commit '23582d7da022aac190dc86e9536d9e5b45a80220':
  Remove dependencies on FloatMath