Commit aff5d4f5 authored by Adam Vartanian's avatar Adam Vartanian Committed by android-build-merger
Browse files

Merge "Small updates to OkHttp-Conscrypt interaction" 

am: 8df04b23

Change-Id: I26dcca2d42c5cd62a822abc08d7e69707298f9fb
parents d9802504 8df04b23
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