tree 814017ef408ded50d48b5ef3fdf09f80f509a561
parent 2bfef83bc01340be5a551d450532696f0704f603
parent e08313c3e1e6f6cbbb67759214e1dbde11696c3c
author Cole Faust <colefaust@google.com> 1661881237 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1661881237 +0000

Resolve conflict in naming of ahat module and file am: 196d4674dc am: 4075ae5736 am: e987819f75 am: 56c5925e24 am: e08313c3e1

Original change: https://android-review.googlesource.com/c/platform/art/+/2200104

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