tree 23b0f1e0e4913f33eced4b3d2148d6f497d31499
parent 84e6d466edc2aba711f90431a1cd209d11c0e70d
parent 09fd5a1873fa1ab51f4e428b1b909fea35091a51
author Neil Fuller <nfuller@google.com> 1413799834 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413799834 +0000

am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"

* commit '09fd5a1873fa1ab51f4e428b1b909fea35091a51':
  Replacing FloatMath native implementation with calls to Math