tree 64eb7671f3c0fd850a04727305dd2e5c49780846
parent 493b59e6a5eb171c5710c4751c8f4feafddd6adb
author Googler <noreply@google.com> 1555108136 -0700
committer Copybara-Service <copybara-worker@google.com> 1555108247 -0700

Augment ResourceProcessorBusybox with capability to auto-resolve unambiguous attr resource conflicts.

When a merge conflict has been detected between a strong attr resource and a weak attr resource which doesn't specify format, this is acceptable. Select the strong attr and keep the conflict from being reported as a conflict needing manual resolution.

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: 243344206