Merge "Code cleanup." into experimental
authorDmitry Kovalev <dkovalev@google.com>
Mon, 25 Feb 2013 22:14:22 +0000 (14:14 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 25 Feb 2013 22:14:22 +0000 (14:14 -0800)

Trivial merge