Commit 3c322d60 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
am: 08acc2eb  -s ours

Change-Id: I2503a161f7c518d05ea0077554d78a5a03985373
parents 25f1aab4 08acc2eb
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