Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 26d9bbd3 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Automerger Merge Worker
Browse files

Merge "Add checkServerTrusted with OCSP and TlsData parameters to... 

Merge "Add checkServerTrusted with OCSP and TlsData parameters to RootTrustManager" into main am: d068a0c0 am: 82f99db8

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



Change-Id: I142ed8163ebaf3fb3365be5d71a829a16f2bb6ce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbca2aa0 82f99db8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment