Fix bad merge caused by repetitive nature of chromium.fyi.json.

Fix bad merge caused by repetitive nature of chromium.fyi.json.

This is a follow up to https://codereview.chromium.org/2455223002/

BUG=607996
Committed: https://crrev.com/4e87d77ff1553c9e446009d330e128251d8d7d71
Cr-Commit-Position: refs/heads/master@{#428422}

[krasin1, 2016-10-28 04:39:40]

krasin@chromium.org changed reviewers:
+ dpranke@chromium.org

[Dirk Pranke, 2016-10-28 14:34:02]

sigh. lgtm.

[krasin1, 2016-10-28 17:08:35]

The CQ bit was checked by krasin@chromium.org

[krasin1, 2016-10-28 17:08:35]

The patchset sent to the CQ was uploaded after l-g-t-m from dpranke@chromium.org
Link to the patchset: https://codereview.chromium.org/2460773002/#ps20001
(title: "sync")

[commit-bot: I haz the power, 2016-10-28 17:08:56]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[krasin1, 2016-10-28 17:09:31]

On 2016/10/28 14:34:02, Dirk Pranke wrote:
> sigh. lgtm.

Thanks.

For the record, I have just synced my local client again, and verified that the
current merge is still valid.

[commit-bot: I haz the power, 2016-10-28 18:05:24]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-10-28 18:22:25]

Description was changed from

==========
Fix bad merge caused by repetitive nature of chromium.fyi.json.

This is a follow up to https://codereview.chromium.org/2455223002/

BUG=607996
==========

to

==========
Fix bad merge caused by repetitive nature of chromium.fyi.json.

This is a follow up to https://codereview.chromium.org/2455223002/

BUG=607996

Committed: https://crrev.com/4e87d77ff1553c9e446009d330e128251d8d7d71
Cr-Commit-Position: refs/heads/master@{#428422}
==========

[commit-bot: I haz the power, 2016-10-28 18:22:26]

Patchset 2 (id:??) landed as
https://crrev.com/4e87d77ff1553c9e446009d330e128251d8d7d71
Cr-Commit-Position: refs/heads/master@{#428422}