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

Change-Id: I9afe7e90abdbe33bb568c720e07e8ab7fbd35f65
parents c7b5f345 95923506
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