tree 69789e39eaf02762715b216afb40e57d1574f625
parent ba1358b4f36b4f9ab67310ac2dc3eae207e4e8a5
author Ben Murdoch <benm@google.com> 1375984519 +0100
committer Bart Sears <bsears@google.com> 1375994302 +0000

Cherry pick of https://codereview.chromium.org/22486004/ PS5

Chromium stability fixes.

Bug: 10144150

Change-Id: I2f552180deca1c1caefe0768eeae1619dc9ea4b1