tree e0693f90ddf4f1260986c2c5a7a59739524eef86
parent 7c306925383d1957b99fc607ee9a28d994f7af18
author Christoffer Quist Adamsen <christofferqa@google.com> 1614938177 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> 1614946531 +0000

Allow class merging in presence of annotations

Bug: 179019716
Change-Id: Iada4c17529ca417d456007750f9cd46daeaf5268