Commit 6247b330 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

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