tree 7dafbe4158b44274a721e61d28ed73ac99cf6b21
parent 6a79ae2567ad8b28fc17e5148f42aba2475195b5
parent d951dc17cb6a041b1b88c207d08dcb3659ad2b0a
author Cole Faust <colefaust@google.com> 1661923918 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1661923918 +0000

Merge "Fix module-file name collisions" am: cdaa8466e0 am: eb143ce893 am: d951dc17cb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2201115

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