Merge "Clean out more MSVC warnings"
authorYaowu Xu <yaowu@google.com>
Thu, 9 Jul 2015 17:49:06 +0000 (17:49 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 9 Jul 2015 17:49:08 +0000 (17:49 +0000)

Trivial merge