tree 12585581d09a60bc919f50f901b4c90d658e5eef
parent 176f13a70845555d6b5776ddacdae8771dccb13f
parent ab4fc82315567a1400bb25af3f835f1b5d80a0fe
author Elliott Hughes <enh@google.com> 1404345068 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404345068 +0000

am ab4fc823: Merge "Fix all resolv warnings and turn on -Werror."

* commit 'ab4fc82315567a1400bb25af3f835f1b5d80a0fe':
  Fix all resolv warnings and turn on -Werror.