Merge "Removing MAXF macro and using MAX instead." into experimental
authorDmitry Kovalev <dkovalev@google.com>
Fri, 3 May 2013 03:48:36 +0000 (20:48 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 3 May 2013 03:48:36 +0000 (20:48 -0700)

Trivial merge