tree 9edec48bbc42e8e10ba1a523210dff49d9701808
parent 4d2eb16cba7a5f0aacc88c1ccf2e848995299b9e
author Googler <noreply@google.com> 1555537520 -0700
committer Copybara-Service <copybara-worker@google.com> 1555540964 -0700

Accept weak-weak merge, if one side has no format specified, as auto-resolvable.

There are dozens of conflicts among appcompat and Material that would get auto-resolved as a result of this change. The alternative would be to get them to promote all their weak attribute definitions to strong.

RELNOTES: None.
PiperOrigin-RevId: 244071490