tree 01db81f39542c782d5aaa23711bbd82af5769055
parent 1ba5e84b48beb4f229f9f7db838beaba7dc799da
author Michael Achenbach <machenbach@chromium.org> 1428614712 +0200
committer Michael Achenbach <machenbach@chromium.org> 1428614723 +0000

Version 4.4.9.1 (cherry-pick)

Merged 1f7a7b32d721cd48447017340961bf5ec80d199a

Fix C++ violation.

BUG=chromium:475643
LOG=N
TBR=thakis@chromium.org

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

Cr-Commit-Position: refs/heads/4.4.9@{#2}
Cr-Branched-From: 725cdc533cb4e31c042d32ce1979012b5bd99ced-refs/heads/master@{#27686}