tree 9dcbdd5da2128ea6cce03a9bf5240247935cafce
parent a19e1d1c6519e6adaa37ae151dc87cb04fe998b0
parent db42a9f5a3b8a6bb6af2d9ef42844c8dc835527b
author Elliott Hughes <enh@google.com> 1404756153 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404756153 +0000

am db42a9f5: Merge "Fix three clang complaints about the DNS code."

* commit 'db42a9f5a3b8a6bb6af2d9ef42844c8dc835527b':
  Fix three clang complaints about the DNS code.