| commit | 2e175b7c8fd53a4f8a3896e063cebc5002f98a8b | [log] [tgz] |
|---|---|---|
| author | Miguel Aranda <miguelaranda@google.com> | Tue Oct 29 15:58:20 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 29 15:58:20 2024 +0000 |
| tree | c2f816e3cea65f19ae68303a7c9f8e99206c0a0b | |
| parent | 02bd7c0513144f92c147e84170994bf54bd356d8 [diff] | |
| parent | bda2c1fb4476c438905fc641c4400b7e40ca675c [diff] |
Merge "Revert "Temporarily disable Conscrypt perf tests"" into main am: bda2c1fb44 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3324434 Change-Id: Ib396a8c5b5f284332d0bd12ba0cd97e0ba0e2c41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>