tree 5e95ce8c7c8c2d30474d55c3100e08bf8fa5d0d9
parent 8539179a11a22401e92c3ba1f3e5cad83d28789c
parent 31db1e8bf47e93c71ead89b25850ccb39fd4dad8
author Lorenzo Colitti <lorenzo@google.com> 1450923000 -0800
committer android-build-merger <android-build-merger@google.com> 1450923000 -0800

Merge "Don\'t enable MDNS on non-multicast, non-broadcast interfaces." am: 306cc40dd3
am: 31db1e8bf4

* commit '31db1e8bf47e93c71ead89b25850ccb39fd4dad8':