tree beda0a04e8c57f4f699cec34c3ecfe3f4150209e
parent d9fb8dd703637f735fbb8aab17de31a265a59ab0
parent e4cc9c7725b420215d194e5b3b72235ef6efb1a2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1713489063 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1713489063 +0000

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

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

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