Commit 8add0d42 authored by Android Merger's avatar Android Merger Committed by android-build-merger
Browse files

Merge "Merge "Porting from http://r.android.com/453156 to fix... 

Merge "Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev am: c1db58bc  -s ours" into nougat-cts-dev am: 54f94a32  -s ours
am: c7b5f345  -s ours

Change-Id: I5eb5fce0a25c4d1221ca39fc1c25bedb994c5999
parents ee4e3893 c7b5f345
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