tree af3eee3f6552d837e96403e8e70707c6173985c2
parent ce2f7ef7fce3345a94fd20307fc02389b98059f9
parent 0bb48ec2749edc12b017f1d2984719144cfb74ce
author Cole Faust <colefaust@google.com> 1662098020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662098020 +0000

Merge "Fix module-file name collisions" am: 92f4e14b94 am: b88cb3e1ce am: 1d4139e72d am: 645e261b33 am: 0bb48ec274

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

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