tree ea2a2b1ec3b6e1e2e0c196c03d60a94ac7176b82
parent bc87a068b500b2ce254c89fdd0e154914e441102
parent 6b5a8b2336a2b5b5466cdb8cf2831a4ce9592a8e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1713489793 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1713489793 +0000

Merge "Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into android12-tests-dev am: e4cc9c7725" into android12L-tests-dev am: 6b5a8b2336

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

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