tree 73cf3f0c326b8aa6f500aea10f8e8a184cc4a22a
parent 742cb88169037ff09f87822293fe102abe84486a
parent 56c5925e2472a37d8e0779963a7aa4da3f19ddb0
author Cole Faust <colefaust@google.com> 1661879572 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1661879572 +0000

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

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

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