tree 80d4df3e80ceba87213962bc9d0c4d0927f51830
parent 35dccce0a7b5bfb5819e752690aa5cd0f110d527
parent 04d7e66ade372e911ede07d4514688b83d7ac12c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1713490725 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1713490725 +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: 04d7e66ade -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: Ieefaaeceb1f3686c899492f2531aa4ac82260eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>