tree 1ce4371a70a14b9083cccce9b7713690765e4082
parent 8555d638b8375f6bf6bb13cec546e415caf54861
author Benjamin Lerman <qsr@chromium.org> 1421929377 +0100
committer Benjamin Lerman <qsr@chromium.org> 1421929377 +0100

Update from https://crrev.com/312600

TBR=jamesr@chromium.org

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