tree 670c781d22b2dc2db903b73031513426901cd87d
parent af57eb737c95c394f0984c6494a2068f08d195e1
parent 572394a5cf745ba6559c82dcf1fc0fc11188199c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1695145642 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695145642 +0000

Merge "Make conscrypt-tests visible to //libcore:libcore-non-cts-tests-txt" into main am: 8ad697dd4a am: 572394a5cf

Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2756625

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