tree 4297d915dbdab66eb26443fad499e84dba7efcd1
parent 975230c6b976aad45c8cc38e19cfe289ca665d12
parent 5abbbf811e99d5b35433d46baaf58a20133fed89
author Aurimas Liutikas <aurimas@google.com> 1628637882 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1628637882 +0000

Merge "Revert "Remove sam-conversions=class workaround"" into androidx-main