tree 62f760230c5c3b7406f08498a54c63a8fce033b2
parent 882867ddd8e4ed0a03f3c7950c20576449c4741f
parent 127b478ac61eed99894998b38bca82b79b8e56b1
author Chris Craik <ccraik@google.com> 1436321467 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436321467 +0000

am 127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev

* commit '127b478ac61eed99894998b38bca82b79b8e56b1':
  Remove all usage of fmin and fmax