tree b00848fda62b43f04e1ce2c09561b745d65a25a5
parent 3ea54fdb490b973e2754cb438c7341e35df3b4cc
parent 0ff535eabbdf27ec5a790adbc64f27f8c63e7399
author Adam Cohen <adamcohen@google.com> 1438368597 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438368597 +0000

am 0ff535ea: (-s ours) Remove references to FloatMath, deprecated in M

* commit '0ff535eabbdf27ec5a790adbc64f27f8c63e7399':
  Remove references to FloatMath, deprecated in M