tree dd60a4128a748b296c3d08bf6e114421417cec1b
parent 52eecfa1fde7b09064fe8cbff6f50d45932d9edc
parent 4075ae5736ddec2c7aa12b1ff1b18946571fd3c0
author Cole Faust <colefaust@google.com> 1661876350 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1661876350 +0000

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

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

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