commit | 5f5834de0f74fc0b02e14c8cdef6f41c9dac31df | [log] [tgz] |
---|---|---|
author | Miguel Aranda <[email protected]> | Wed Jul 31 11:11:08 2024 +0000 |
committer | Automerger Merge Worker <[email protected]> | Wed Jul 31 11:11:08 2024 +0000 |
tree | e8bd66de0cb25a2701a0e4f851a4c64cded3ff5f | |
parent | 416ccb14c1bd4b95d19971e398dd76073d5cdfac [diff] | |
parent | 7a4600811a773f0e687a0c4f1f30e07fd1f3c7db [diff] |
Merge "Ignore failing conscrypt perf tests until I figure out why they're failing." into main am: 4dd6ff9717 am: 7a4600811a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3200931 Change-Id: I21b59fbd75bf8c4c95e013da485b645774784db9 Signed-off-by: Automerger Merge Worker <[email protected]>