Merge "Fix visual studio build failure."
authorMarco <marpan@google.com>
Thu, 12 Mar 2015 00:19:47 +0000 (17:19 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 12 Mar 2015 00:19:47 +0000 (17:19 -0700)
commit0adc58037a8e47a4ecd230282fc75908db47ae9b
tree512a298e98df1540854d29acaf89cd0e1e75667e
parent4a691aa20949e7d5159a80d83ed406846f640341
parenta291b0b4a393f3368d9013796843e16cdf97ccdb
Merge "Fix visual studio build failure."