Merge "Disable avx/avx2 for Visual Studio 2010"
authorJohann <johannkoenig@google.com>
Tue, 19 Nov 2013 19:17:19 +0000 (11:17 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 19 Nov 2013 19:17:20 +0000 (11:17 -0800)

Trivial merge