tree fa0470d5a593df36054af3c61d1641c645445f0f
parent 80bc7f98087a439789266c37cf204617e7f3638d
parent 348e84d45c0ac50b12d0fc6b6e7a05cb1f9a02f8
author Jordan Demeulenaere <jdemeulenaere@google.com> 1659890488 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1659890488 +0000

Merge changes I8f9f6aee,Ib0f7829b,I8eea2c22,I5e5b0957 into tm-qpr-dev

* changes:
  Import AndroidX from build 8176997
  Add Compose ui-test-manifest
  Import AndroidX from build 8176997
  Add more androidx compose libraries