Merge "Fix compiler warnigns for msvc2013"
authorYaowu Xu <yaowu@google.com>
Tue, 6 Jan 2015 16:01:47 +0000 (08:01 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 6 Jan 2015 16:01:47 +0000 (08:01 -0800)

Trivial merge