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

Merge "Drop support for proxying FTP over HTTP" am: a2a43b61 

am: 1a46e8dc

Change-Id: I2a47293b7ed4e7655d292c8dad9f787ca0d8b4d8
parents 260524f1 1a46e8dc
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