tree 301913580215be04d3393b47d12339dcdd1db32e
parent a10277e3e4c01e08f53b98eac3c98bf94482b106
parent df72b63928cc1492b72ba9a4e99d5e714f93ccc6
author Chris Craik <ccraik@google.com> 1435774230 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435774233 +0000

Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev