tree a6b24526ccb8bc6d2a22aaeae490bc6f31deb6bf
parent f6b303e9be0100f6d40f07b799748272082dd54a
parent 53acc5b184d6c79c451c15e330e03cb361079829
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1705371859 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1705371859 +0000

Merge "Remove unused Android.mk in MergeOnlyTest" into main am: 51ecc0695c am: 53acc5b184

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

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