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

Merge "Fix module-file name collisions" am: e4793273da am: 713073831f am: 3e21821be8 am: 5e78e9e93a am: c2aaa90b6e

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

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