NOTE: once this is merged, also merge Ie7b47e6868cc on the OAuth repo, to fix unit tests after a breaking change to Router's constructor signature. Bug: T230842 Change-Id: I8f5b92918a58e44a4f2d8c78d234d9f64c2d06bf
This adds diffs for use in an interactive merge when detecting an edit conflict. Bug: T230843 Change-Id: I6345361fce98524027ad778749d4fbf54169ccb6
Bug: T230843 Change-Id: I95289eddfc9ab2e0cef11b9363a5e239cdb2258e