tree f7847c0b1864a35ccf3ddbeaa0eab0192d8afabf
parent 891bef732ab12a25adfd83765c3a69bf1c7337be
author Alexis Hetu <sugoi@google.com> 1424719051 -0500
committer Alexis Hetu <sugoi@google.com> 1424719051 -0500

Merging fix for 448423 into M41

TBR=reed@chromium.org
NOTRY=1

BUG=448423

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