tree 29aac5b546f4e7498f9b89fea270b19f953f6fc5
parent 7962f21529c2eadef152cbed50c4118c5846a328
author Christoffer Quist Adamsen <christofferqa@google.com> 1602573077 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> 1602575620 +0000

Fix bug when merging methods with default super method

Bug: 163311975
Change-Id: I46a0b4176758d7d19ff7354612fcf1e136d4c4fa