Merge "Code cleanup." into experimental
authorDmitry Kovalev <dkovalev@google.com>
Thu, 28 Feb 2013 00:43:04 +0000 (16:43 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 28 Feb 2013 00:43:04 +0000 (16:43 -0800)

Trivial merge