summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-09-01 20:49:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 20:49:56 +0000
commitcab9a86648f02c9916dd6a9a5406f06beb454df7 (patch)
tree3c33a58425b68749714b711ef240fa05104b5a17
parente1efee9eb9adfe57e1bae0429154a9900af04d34 (diff)
parent427e74dbf1428ffbb8aaff98c823fbf9ca40140c (diff)
downloadlibcore-cab9a86648f02c9916dd6a9a5406f06beb454df7.zip
libcore-cab9a86648f02c9916dd6a9a5406f06beb454df7.tar.gz
libcore-cab9a86648f02c9916dd6a9a5406f06beb454df7.tar.bz2
am 427e74db: am 2f390ac3: am 4dcf9511: am ed4dd365: am 89fd4cad: am dbf66a12: am 5557c720: am 381d70a8: am 27ef0eb2: Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipop-cts-dev
* commit '427e74dbf1428ffbb8aaff98c823fbf9ca40140c':
0 files changed, 0 insertions, 0 deletions