Merge "cpplint style issue"
authorJim Bankoski <jimbankoski@google.com>
Mon, 30 Sep 2013 00:07:27 +0000 (17:07 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 30 Sep 2013 00:07:27 +0000 (17:07 -0700)

Trivial merge