tree dd60a4128a748b296c3d08bf6e114421417cec1b
parent 08f25875456cb84010c2d68f3e162cd0f3267b87
parent e987819f75a4b14d23633ca7164967c71c9aa6cb
author Cole Faust <colefaust@google.com> 1661877954 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1661877954 +0000

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

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

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