GitLab

preferences.mojom and preferences_configuration.mojom had to be merged as they
would cause a circular import otherwise.

BUG: 654988
Change-Id: I061365e7c6c7ae3c851e427a24d2a322e1210987
Reviewed-on: https://chromium-review.googlesource.com/514902Reviewed-by: Martin Barbella <mbarbella@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Commit-Queue: Johan Tibell <tibell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#476490}