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

Merge upstream master 

Fixes a use of native code after init failure.

Also moves libcore.tlswire package to org.conscrypt.tlswire.

Test: cts -m CtsLibcoreTestCases
Change-Id: I810d6e467306c714136808f56e00d1ccb7a2c337
parents f1331934 023ec1da
Expand all 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