tree 8261a0e30c6118b93c36869be831b4cf6cb04f50
parent 06a2785875a3a088f5e49861dbcd42a3aff4258d
author Kristian Monsen <kristianm@google.com> 1378850587 -0700
committer Kristian Monsen <kristianm@google.com> 1378850733 -0700

Manual cherry-pick of https://codereview.chromium.org/23623020

Fix for bug 10043555

I don't have a molly, and could not reproduce. This means it is
untested, but at least it builds.

Change-Id: I9a114e6902af6ddc2e3f0c617b4222a4ac3b205c