tree 492d8df9372a37b05ed3c473cbd75d66fe0e723c
parent 7368b312e99de0f2809afde1ea5a1b21d44019b0
parent e4793273da1dd6f306e922e386bd8172bc1ca039
author Cole Faust <colefaust@google.com> 1662142602 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662142602 +0000

Merge "Fix module-file name collisions" am: e4793273da

Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971

Change-Id: I76942bfe7b0fc4a7170358c3f9954d33d10ca31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>