tree 1dd5c9a3b955c541c00b4621fa3e02051606f028
parent e371085cdc53230825034d7118cb9f09e3aad2a5
parent 6779e405d045a782356c7b98ce6f7d2a459a4cca
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1674672130 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1674672130 +0000

Merge "[automerger skipped] Merge "Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours" into android13-tests-dev am: 6779e405d0

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758

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