tree 31a8f1356d58a52b07ad44c2926b4deafe3ea2d0
parent 211a4ad020bf35b9c813f3e8d1131c19765e8bb1
parent 6e8d834c9e7311ed8cefb95da3dba029cf303107
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1669869859 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1669869859 +0000

Merge changes from topic "am-aee15d9865144c69afd5114d48e8c569"

* changes:
  Merge "[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" into android13-tests-dev am: 6779e405d0
  [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