tree 624f1dbf4b64fa1721c7bf22482260287e09e076
parent 7ebddb1cb50ff0be24c9718a8a3b8b0e6bb55076
parent af78422c0da13814f52de6f4c83bcdd9c54ffc9d
author Miguel Aranda <miguelaranda@google.com> 1725879548 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725879548 +0000

Merge "Temporarily disable Conscrypt perf tests" into main am: af78422c0d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3259691

Change-Id: I843f6bd5c9be3a7f0986e82bc8f690404153cea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>