tree 33bb3dd6f3fc9516e14069dbb383aa87552a376e
parent e14c8665bab5709547588c7a5118c944a9fe684d
parent d59010441b866ec457a75be58ce3871da7e8b0b9
author Yabin Cui <yabinc@google.com> 1699911572 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699911572 +0000

Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into main am: d59010441b

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

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