tree ad9d4f2b2f10b4e668e2c76b6327bd33db0fd782
parent 3393a964f7b9e475fa9052acf35d78be54f4cae7
parent 29bc9ccd7b93087132b50e8154d0ee5bff0cac12
author Neil Fuller <nfuller@google.com> 1418124312 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418124312 +0000

am 29bc9ccd: Merge "Avoid a reverse DNS-lookup for a numeric proxy address"

* commit '29bc9ccd7b93087132b50e8154d0ee5bff0cac12':
  Avoid a reverse DNS-lookup for a numeric proxy address