| commit | bbc0bef481bda6dcafe44efff16395fff4f92118 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 19 01:38:50 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Apr 19 01:38:50 2024 +0000 |
| tree | 80d4df3e80ceba87213962bc9d0c4d0927f51830 | |
| parent | 35dccce0a7b5bfb5819e752690aa5cd0f110d527 [diff] | |
| parent | f12e08aae6107637b486943e8eebc695d11d8d0e [diff] |
Merge changes from topic "am-70381af1ffc5488eae2b942658dfabd3" into main * changes: Merge changes from topic "am-4212e85279cd4af49081bfd97be33764" into android14-tests-dev am: 6df0a78dd6 -s ours [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 am: 04d7e66ade -s ours