Merge "Removing redefinition of ROUND_POWER_OF_TWO."
authorDmitry Kovalev <dkovalev@google.com>
Thu, 27 Feb 2014 21:43:31 +0000 (13:43 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 27 Feb 2014 21:43:31 +0000 (13:43 -0800)

Trivial merge