tree 6dbf435420f3d5474a1456147c335b10cab203d4
parent 24e570257edc6bc35f62bcbaadab35527d481853
parent 2081fda69a68505c914324797400b1b798516904
author David Turner <digit@google.com> 1296181708 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296181708 -0800

am 2081fda6: Merge "Only look up A records if the system has IPv4." into gingerbread

* commit '2081fda69a68505c914324797400b1b798516904':
  Only look up A records if the system has IPv4.