tree dc5d3d22939850d9e7f3ce819367bdbd88a35933
parent e07e805b1b62404193b376b80b3fcaa2051a4444
parent db3e8770412a9e2ce177d93478002bb2c896dde4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1714516681 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1714516681 +0000

Merge "Fix JVM conflict with getRequiredTypeConverterClasses()" into androidx-main