tree 7b9f83ee159d1a3c2cee8f5db829257743ba4b0d
parent 2a779ea829ae0f56169d53dddb11d2a2d70e63c5
parent ab8d138d42c4dc631319132e3943ae564678f15a
author Colin Cross <ccross@android.com> 1689611455 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1689611455 +0000

Merge changes Ied0a6cfe,I8c025efe into main

* changes:
  Reland: Use depsets for transitive manifests and assets
  Add test for manifest merger