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

Merge "Merge "DatagramChannelMulticastTest: Briefly wait for non-instantaneous... 

Merge "Merge "DatagramChannelMulticastTest: Briefly wait for non-instantaneous reads." into oreo-cts-dev am: 54d41e65" into oreo-mr1-cts-dev am: e7483acd
am: 434ab251

Change-Id: I278f36a4c595e351ccae844767213c551e3f6cd6
parents 37e8dd9d 434ab251
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