tree c057b37b0a40dffff1cb73d85d4ef67b38d2b4dd
parent 0aa84269447141a032c0f3ad7830e9a2aa069809
parent 3bd75303f96a0838d971f98f941ee90bee6ba17d
author Elliott Hughes <enh@google.com> 1390950667 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390950667 +0000

am 3bd75303: am c75e7726: Merge "Remove a __system_property_get call from the DNS code."

* commit '3bd75303f96a0838d971f98f941ee90bee6ba17d':
  Remove a __system_property_get call from the DNS code.