Merge "Add a few "const""
authorYaowu Xu <yaowu@google.com>
Mon, 14 Apr 2014 03:21:54 +0000 (20:21 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 14 Apr 2014 03:21:54 +0000 (20:21 -0700)

Trivial merge