tree 2a2d55ccd1fdce733f685ad2b40996f7cf0cea8d
parent 1f0da76cb17b9a0d17b6438aed7bb106394597ff
author Rico Wind <ricow@google.com> 1576751747 +0000
committer Rico Wind <ricow@google.com> 1576751770 +0000

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

This reverts commit 048963c785b73af00b866cc9b99e3e952e023c79.

Reason for revert: breaks old vms

Change-Id: I3b698c036bb3f5c406515f1d8f580a482f80208a