OSDN Git Service

am e7b8bc4e: Merge "Clean up DNS proxying."
authorElliott Hughes <enh@google.com>
Thu, 11 Dec 2014 18:18:57 +0000 (18:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Dec 2014 18:18:57 +0000 (18:18 +0000)
commit1dff030e6eb527eeb4e7ed163cf19641fdb3872b
tree35e553cc74fbbbe1286b93ef725e29e2570aecdc
parentca5edfb23ba45176d1e33fba6f38e7834ef33301
parente7b8bc4e291a08dfb6f2f84a2bb0ca99f3bbada6
am e7b8bc4e: Merge "Clean up DNS proxying."

* commit 'e7b8bc4e291a08dfb6f2f84a2bb0ca99f3bbada6':
  Clean up DNS proxying.