tree e15ac0aea7efe9c61a1d11e62c148c739c3e8708
parent 79b92ef41c45d19392cb5ede493ff86f8b849f68
author Morten Krogh-Jespersen <mkroghj@google.com> 1579255720 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> 1579255750 +0000

Ensure handling of optional type args and inner if class was merged

Bug: 147800709
Change-Id: I71d7041df0d455fcf07287b50385181d78fdb50a