Merge "Visual Studio build (warning) fix"
authorDeb Mukherjee <debargha@google.com>
Mon, 15 Sep 2014 16:50:17 +0000 (09:50 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 15 Sep 2014 16:50:17 +0000 (09:50 -0700)

Trivial merge