Merge "Fix building for arm with Visual Studio 2013"
authorJohann <johannkoenig@google.com>
Wed, 7 May 2014 13:00:54 +0000 (06:00 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 7 May 2014 13:00:54 +0000 (06:00 -0700)

Trivial merge