Merge "Clean up DNS proxying."
authorElliott Hughes <enh@google.com>
Thu, 11 Dec 2014 18:12:10 +0000 (18:12 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 11 Dec 2014 18:12:10 +0000 (18:12 +0000)

Trivial merge