summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-07-01 18:10:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-01 18:10:33 +0000
commitd3ecb3e6f04a0f76c886238af6bef1d10b987a42 (patch)
tree301913580215be04d3393b47d12339dcdd1db32e /services/java
parenta10277e3e4c01e08f53b98eac3c98bf94482b106 (diff)
parentdf72b63928cc1492b72ba9a4e99d5e714f93ccc6 (diff)
downloadframeworks_base-d3ecb3e6f04a0f76c886238af6bef1d10b987a42.zip
frameworks_base-d3ecb3e6f04a0f76c886238af6bef1d10b987a42.tar.gz
frameworks_base-d3ecb3e6f04a0f76c886238af6bef1d10b987a42.tar.bz2
Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev
Diffstat (limited to 'services/java')
0 files changed, 0 insertions, 0 deletions