tree d193c833fa08cfc982c9aee11e5fb1fc38af8495
parent 5433dd153050d68bf8ac774152959f9bd4f77e39
parent 8565b665fae91572b3090c34e5957615ee8e9e02
author Yabin Cui <yabinc@google.com> 1637020160 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637020160 +0000

Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." am: 8565b665fa

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

Change-Id: Id86133d0c6104b6fa4667a3fee76fdc60d7577e8