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

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

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

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