commit | 7b293b5556e78028449e287f275f32a1ad298293 | [log] [tgz] |
---|---|---|
author | Chris Craik <ccraik@google.com> | Fri Jul 03 20:35:50 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 03 20:35:50 2015 +0000 |
tree | a8c4efe799cc80e3cfecfb86afbeb3ea2a3d0c4e | |
parent | ad1797bdaef113ec4d4ccbb806fe8d1aac09592e [diff] | |
parent | c3988e0aa337b74693feb0abb898eb87fbb61b58 [diff] |
am c3988e0a: am b4c02e8f: am d3ecb3e6: Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev * commit 'c3988e0aa337b74693feb0abb898eb87fbb61b58': Switch from fminf/fmaxf to std::min/max