commit | b2b1ca989246239aceaa5eb3a1cab4b64851ad48 | [log] [tgz] |
---|---|---|
author | Miguel Aranda <miguelaranda@google.com> | Tue Oct 29 16:23:40 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 29 16:23:40 2024 +0000 |
tree | b5ba0ae2ed17de94adf08f0fe872afe1b3cea760 | |
parent | 8446cf5745ac41c1e63a287bf123fb18848733dc [diff] | |
parent | 2e175b7c8fd53a4f8a3896e063cebc5002f98a8b [diff] |
Merge "Revert "Temporarily disable Conscrypt perf tests"" into main am: bda2c1fb44 am: 2e175b7c8f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3324434 Change-Id: Ife4be2fa7eb0fa3c2680cc470179ee9620f7f6f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>