tree 3cecfc09afde1e35d0cc7ab536c520019e2c22ef
parent 5917edcf73e9c33f766430f079fccd7a63f3fba7
author Rico Wind <ricow@google.com> 1576757701 +0100
committer Rico Wind <ricow@google.com> 1576762940 +0000

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

Bug: 146419367
Change-Id: I0e09897fa01efd368cb965f32123eaa9d9af1970