tree 31a8f1356d58a52b07ad44c2926b4deafe3ea2d0
parent 211a4ad020bf35b9c813f3e8d1131c19765e8bb1
parent 9511f8dfeeef51e88096497b5e1d7f775c270fb6
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1669869853 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1669869853 +0000

[automerger skipped] Merge "Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours am: 9511f8dfee -s ours

am skip reason: skipped by user yabinc

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

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