tree e22a12d83454dba957645f586b4505c08417fb85
parent 5ddeb46264fe8ba308a36dd3e69b110a42aa591f
author Benjamin Lerman <qsr@chromium.org> 1422970512 +0100
committer Benjamin Lerman <qsr@chromium.org> 1422970512 +0100

Update from https://crrev.com/314320

TBR=jamesr@chromium.org

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