Commit b9ea2fd3 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
am: 236c07df

Change-Id: I104331c16dff8cf21d28a3ab7ffac7c039be947a
parents 1677d847 236c07df
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