tree 5e95ce8c7c8c2d30474d55c3100e08bf8fa5d0d9
parent c68fd1dcf3abb442a5f9a6de6834687df5216fac
parent 7d86a89a16598fe21fc25d8c99eed182e39848a9
author Lorenzo Colitti <lorenzo@google.com> 1447903488 +0000
committer android-build-merger <android-build-merger@google.com> 1447903488 +0000

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

* commit '7d86a89a16598fe21fc25d8c99eed182e39848a9':
  Don't enable MDNS on non-multicast, non-broadcast interfaces.