tree c386f73b025f1107419bd73f560655667a8f99d8
parent d3f77071575aa527c015ec064ccdd0fc1671be7a
author Christoffer Adamsen <christofferqa@google.com> 1741250012 +0100
committer Christoffer Adamsen <christofferqa@google.com> 1741251259 -0800

Fix BootstrapMethodError from invalid class merging

Bug: b/397737234
Change-Id: Icacf51f06017c50b3448610e8493a225c225c40d