Commit 929e12af 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 am: b9ea2fd3 am: 7d906973 am: 95923506  -s ours am: 7e5b36c8  -s ours am: 648b779e  -s ours
am: 7987794c  -s ours

Change-Id: I5dd3e5ccc5801a2c8c2ba315bbc3564b49f55cf9
parents 7b31b878 7987794c
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