Commit 809d0239 authored by Android Merger's avatar Android Merger Committed by android-build-merger
Browse files

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

Merge "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" into nougat-mr1-cts-dev
am: 6cf2df9f  -s ours

Change-Id: I78bed009aa6a3bcc5c73321cb0e56e014d6de887
parents 8e539c7d 6cf2df9f
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