Commit 95923506 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

Change-Id: Ibf2c146f1c443676258bb649f6410af449a5e727
parents 48af8a94 7d906973
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