tree 044d10000c0b86d9afa171691875bd1b6ae5f0db
parent 1b014051c44ebcc5ded4409cdcca82fbf5e1fc04
author Rico Wind <ricow@google.com> 1576676635 +0100
committer Rico Wind <ricow@google.com> 1576743755 +0000

Make merging more resilient to backported names from old versions of R8

Bug: 146419367
Change-Id: Ib9e8a1af31295dbbc6b87ca3c0980fae84964e92