| commit | 97742ddc5e9b38a45232989d58bc0ff81761784d | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 25 21:57:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 25 21:57:51 2023 +0000 |
| tree | ffba92a35afb83c7cbefdf06b11bab2c92b7d32a | |
| parent | 7b76d4d84943094cd0560594368f0458cbda1927 [diff] | |
| parent | 610f65b24c036833b9ac350be0667d77892c106b [diff] |
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 am: d766f83731 am: 6f55406858 am: 0dd4254d0e am: 610f65b24c Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2322758 Change-Id: I85d1baeb40ca224fe143c83476fa3ee51a0559b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>