Commit 08acc2eb authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

[automerger skipped] Merge "DatagramChannelMulticastTest: Briefly wait for... 

[automerger skipped] Merge "DatagramChannelMulticastTest: Briefly wait for non-instantaneous reads." into oreo-cts-dev am: 54d41e65 am: 4d9c5ba6
am: 9cf7cd79  -s ours

Change-Id: I8626632e57947fc54fc01553e2511eb9a91e539e
parents 434ab251 9cf7cd79
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