Merge "Fixed a crash windows build"
authorYaowu Xu <yaowu@google.com>
Thu, 29 May 2014 15:16:19 +0000 (08:16 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 29 May 2014 15:16:19 +0000 (08:16 -0700)

Trivial merge