diff options
author | Neil Fuller <nfuller@google.com> | 2015-09-01 20:35:33 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 20:35:33 +0000 |
commit | 427e74dbf1428ffbb8aaff98c823fbf9ca40140c (patch) | |
tree | 3c33a58425b68749714b711ef240fa05104b5a17 | |
parent | 5561e47a23f91518d93c91cca693b2210bf690d1 (diff) | |
parent | 2f390ac3703a9707b3cf413c6d084df08eb3fdec (diff) | |
download | libcore-427e74dbf1428ffbb8aaff98c823fbf9ca40140c.zip libcore-427e74dbf1428ffbb8aaff98c823fbf9ca40140c.tar.gz libcore-427e74dbf1428ffbb8aaff98c823fbf9ca40140c.tar.bz2 |
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 '2f390ac3703a9707b3cf413c6d084df08eb3fdec':
0 files changed, 0 insertions, 0 deletions