tree f0a8d1d41042612ed952c34c21906dc1747888f4
parent 265a4fc62236bbd21454bc9a6c41dfd49045c504
parent 1f2ad9eb7417045c0a08b49a3bdf48600627c57e
author Neil Fuller <nfuller@google.com> 1413800599 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413800599 +0000

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

* commit '1f2ad9eb7417045c0a08b49a3bdf48600627c57e':
  Replacing FloatMath native implementation with calls to Math