tree 7bfdb15dd3eb8c2b6a46efe1156211b1bc37c6c8
parent e08261afd2988f46465a895907f0ef6327c77ed4
author Christoffer Quist Adamsen <christofferqa@google.com> 1622013052 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> 1622025846 +0000

Revert "Disable interface merging"

This reverts commit cb48d33738600a412c4364ec818e27f5a781694e.

Change-Id: I312b393192b93c320d8761c636db26f0b48d035f