Merge "Quantization code cleanup."
authorDmitry Kovalev <dkovalev@google.com>
Thu, 15 Aug 2013 17:23:01 +0000 (10:23 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 15 Aug 2013 17:23:01 +0000 (10:23 -0700)

Trivial merge