tree 4cc8d767302d272b7906588ef1d71724986edb32
parent 51a4f7872acbb26a678940c3bc49b9a3d3a516ac
parent aeb41ec103103c37bf4a1700de714d9ff1befe8e
author Jean-Baptiste Queru <jbq@google.com> 1287694101 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287694101 -0700

am aeb41ec1: am b2061a30: Merge "resolv: make internal symbols static/hidden"

Merge commit 'aeb41ec103103c37bf4a1700de714d9ff1befe8e'

* commit 'aeb41ec103103c37bf4a1700de714d9ff1befe8e':
  resolv: make internal symbols static/hidden