Merge "Code cleanup." into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 21 Feb 2013 18:56:17 +0000 (10:56 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 21 Feb 2013 18:56:17 +0000 (10:56 -0800)

Trivial merge