Commit 87f65753 authored by Adam Vartanian's avatar Adam Vartanian
Browse files

Merge upstream master

Relevant changes:
* Add missing license declarations
* Omit TLS_FALLBACK_SCSV for TLS 1.2+
* Add alias for ChaCha20-Poly1305

Test: cts -m CtsLibcoreTestCases
Test: cts -m CtsLibcoreOkHttpTestCases
Change-Id: I321386ca92a58351bc92f8306a575c85a9821400
parents f10ab2a2 b2c5f501
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment