tree 1583003a891813bf5a9c0e7e74011b439f106070
parent a61edd85792a732dd6c4dff52b6a1fd5c5012b84
parent 77c5f9bc10c696820903d6fb8b226bd0297cef1e
author Tobias Thierer <tobiast@google.com> 1562697513 -0700
committer android-build-merger <android-build-merger@google.com> 1562697513 -0700

Merge "Fix harmony URLConnectionTest hanging for 25sec." into pie-cts-dev am: 781e06ebf9
am: 77c5f9bc10

Change-Id: Ia44cb9a5bf4267715fda6f28d615eb1fe05f5d28