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)
* commit 'e7b8bc4e291a08dfb6f2f84a2bb0ca99f3bbada6':
  Clean up DNS proxying.


Trivial merge