Merge "fix msvc build" into experimental
authorYaowu Xu <yaowu@google.com>
Mon, 6 Aug 2012 14:05:56 +0000 (07:05 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 6 Aug 2012 14:05:56 +0000 (07:05 -0700)
commit0b693c77554e7ee55d2268ee2590e6050fc8a090
tree57b2a7d0c0420c259fcd2b6fcdaa30dbb906ab1d
parent2af5473a90306b993d145ef64faad6ad1ed21a4d
parent236597fd564612778f52f399d2a749c862572a69
Merge "fix msvc build" into experimental