Commit 236c07df authored by Yue, VincentX's avatar Yue, VincentX Committed by android-build-merger
Browse files

Merge "Porting from http://r.android.com/453156 to fix... 

Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev
am: c1db58bc

Change-Id: I5e193e23e285c64e3aadf4ce6074fb40bba412e3
parents 46ec47b8 c1db58bc
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