Merge "Code cleanup." into experimental
authorDmitry Kovalev <dkovalev@google.com>
Tue, 12 Mar 2013 00:22:21 +0000 (17:22 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 12 Mar 2013 00:22:21 +0000 (17:22 -0700)

Trivial merge