tree 909332bb1038734a8aa449d87f9cab7ce2ae9aef
parent 266052af454927fc2d8f4877a8c6d79bf8a2cd36
author Tom Sepez <tsepez@chromium.org> 1418930295 -0800
committer Tom Sepez <tsepez@chromium.org> 1418930295 -0800

Merge: Fix obvious compilation breakage on win32 in previous version.

TBR=thestig@chromium.org

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

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