Commit 2c010066 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

Change-Id: I6913006ad1da9b943d7ef8a52bc453878dbd9da3
parents 40c8320b 54f94a32
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