Merge "Fix a visual studio warning"
authorYaowu Xu <yaowu@google.com>
Mon, 8 Sep 2014 16:17:21 +0000 (09:17 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 8 Sep 2014 16:17:21 +0000 (09:17 -0700)
commit3b56d89255f82a88c5b1901e7ac02b9a135d798d
treeffcbee942706319b4989233dbceaec784195bdd2
parenta61973bf29d4756f6967c0cbc2b805f37f6c00bc
parentdbdb87b72fad01da75b90c84cf732d8d3dd7d1d3
Merge "Fix a visual studio warning"