diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-04-19 01:29:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-19 01:29:18 +0000 |
commit | 6df0a78dd6569195b7ba363372a4c911eebe83a6 (patch) | |
tree | 5b929bcc6607b4d772e4ba0ea4ab6da8caeb1a1e | |
parent | 8961961b842be207ed91b1c137dc6eea2a13acb0 (diff) | |
parent | 04d7e66ade372e911ede07d4514688b83d7ac12c (diff) | |
download | extras-6df0a78dd6569195b7ba363372a4c911eebe83a6.tar.gz |
Merge changes from topic "am-4212e85279cd4af49081bfd97be33764" into android14-tests-devandroid14-tests-dev
* changes:
[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
[automerger skipped] Merge "Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into android12-tests-dev am: e4cc9c7725" into android12L-tests-dev am: 6b5a8b2336 am: 5cec5340a8 -s ours
0 files changed, 0 insertions, 0 deletions