tree 5b929bcc6607b4d772e4ba0ea4ab6da8caeb1a1e
parent dc9ea1d1862cf125dba01cba62ec1ddfc885a980
parent 57b29e5ba9c9d0717fc2626f5313ffeef6727087
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1713490154 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1713490154 +0000

[automerger skipped] Merge "Merge "Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into android12-tests-dev am: e4cc9c7725" into android12L-tests-dev am: 6b5a8b2336" into android13-tests-dev am: 57b29e5ba9 -s ours

am skip reason: Merged-In I846cd2bbf1159abf05e9d754c2e96c12912c7d72 with SHA-1 31ec381052 is already in history

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

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