tree 24f573ce72727391e444782471081c21bb2d730b
parent 16d3bc63f12e27349f234a5d3907d72377c87f4d
parent 225abc82f15069955e0f7868d2a5880d9a505e46
author Treehugger Robot <treehugger-gerrit@google.com> 1513601861 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1513601861 +0000

Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev