tree 62bfc9f80fd0dcdc9686014a4287f8af01dd59ff
parent e84bb330a2f6624d2faabcc912f366b50427f0bf
author Googler <noreply@google.com> 1555450268 -0700
committer Copybara-Service <copybara-worker@google.com> 1555450379 -0700

Automated rollback of commit 088c07d1f61a6483d348728f184121a1af21701a.

RELNOTES: Android resource conflicts will no longer be reported between a strong attr resource and a weak attr resource, if the weak attr does not have format specified.
PiperOrigin-RevId: 243880292