tree 5bcb2f4217a43eac44b8f228dfb5359bc650d01b
parent 0a5fa484fd58d27088f8696bdc11c8cc8f2b4866
author bsalomon <bsalomon@google.com> 1442353275 -0700
committer Commit bot <commit-bot@chromium.org> 1442353275 -0700

Fix vs2015 build

TBR=robertphillips@google.com

Review URL: https://codereview.chromium.org/1344203002