Commit f46f809f authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge \\"Drop unneeded OkHttp compile-time dependency on conscrypt\\" am: c6496f4a 

am: 8771734b

Change-Id: Iccfdb61267f94ff022658b7287669bd3cc2938a3
parents 7a6938c0 8771734b
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