tree 1951f1a15e2b4d82c3eadcf56477533ed199fe6f
parent a7ca662bcb928e9e921b0d3fc4c862a2a91c3183
parent 29489a42d94442544a49b91341c84051d63b1979
author Elliott Hughes <enh@google.com> 1463162696 +0000
committer android-build-merger <android-build-merger@google.com> 1463162696 +0000

Merge "Admit that dnsmasq relies on BSD extensions."
am: 29489a42d9

* commit '29489a42d94442544a49b91341c84051d63b1979':
  Admit that dnsmasq relies on BSD extensions.

Change-Id: I1d2b7eb2d35129b35e38e4fbabee38c49938471b