Commit e307910f authored by Adam Vartanian's avatar Adam Vartanian
Browse files

Merge upstream master 

Fixes SSLCertificateSocketFactoryTest failure due to
OpenSSLContextImpl.getPreferred() still returning a TLS 1.2 context.

Test: cts -m CtsNetTestCases
Test: cts -m CtsLibcoreTestCases
Change-Id: Ib31680d1307942675eb4c3f3bb5ba30a598cd1b0
parents a4ad12e0 d127e08d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment