Commit 7c8141cd 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  -s ours

Change-Id: I6321ad4bd273771d0ac324681a9a8f69cab3e65a
parents c2fc4acf 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