tree 6b9d879208ab44b8ef79cc846a227d1a352f931a
parent efc1a53edda49cf3c09b01d3a89fdd3db6348cb4
parent 9876206e8bf81ac4ef62c5a70f8fc18b950caf79
author Christoffer Quist Adamsen <christofferqa@google.com> 1539341247 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1539341247 +0000

Merge "Handle classes implementing merged types in Proguard -if rules"