Merge "Fix to Visual Studio build error."
authorMarco Paniconi <marpan@google.com>
Wed, 30 Jul 2014 17:33:35 +0000 (10:33 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 30 Jul 2014 17:33:35 +0000 (10:33 -0700)
commit347c8cf68f32c02ce48ce14ed24a08a596550712
tree89a462e04b19b66bddc3914f9b81539c85542a08
parente9935a4ca070c6c7182a44b5807312de1ba6b8a1
parentfbaa4b84afeecc6b443f47d329348685e0017d27
Merge "Fix to Visual Studio build error."