Merge "Fix a visual studio warning"
authorYaowu Xu <yaowu@google.com>
Mon, 8 Sep 2014 16:17:21 +0000 (09:17 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 8 Sep 2014 16:17:21 +0000 (09:17 -0700)

Trivial merge