tree a49d911bc7d2f9ae7b875313be5f4c369cc5a286
parent ee0f7bee1c64e6ee0bef3cc062504c764167817d
author Clément Béra <clementbera@google.com> 1694421959 +0200
committer Clément Béra <clementbera@google.com> 1694421959 +0200

Reland "Fix enum merging with abstract method error"

This reverts commit 13cb42bbb10551c9ca5ff9479daf8b31c2339c14.

Change-Id: I44269b39bcb66424f6c687b19946a373e2abb0c6