tree b4e09202bc217f764818df7961734a2609520628
parent edf7d7a723fa005220769f8916917b6fbf632524
parent 7e6f6965982183ebae357e61e7bad55b91e97cc9
author Elliott Hughes <enh@google.com> 1402696245 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402696245 +0000

am 7e6f6965: am 1e7ae47d: Merge "Bring our "libresolv" stuff in line with glibc."

* commit '7e6f6965982183ebae357e61e7bad55b91e97cc9':
  Bring our "libresolv" stuff in line with glibc.