Commit 8857d6f3 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive... 

Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive buffers" into marshmallow-cts-dev am: c4b12fab  -s ours
am: 6247b330

* commit '6247b330':
  DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive buffers
parents 57813a7d 6247b330
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