Amend merged revisions to deal with chromium transition.

The history branch got amended to deal with the chromium git transition;
update the SHA merged here to reflect the new history.

Change-Id: I2380086cef8af3865a5bdfc5c9f8a79dafc18e44
1 file changed