am 2a70aba8: am ab4fc823: Merge "Fix all resolv warnings and turn on -Werror."
authorElliott Hughes <enh@google.com>
Wed, 2 Jul 2014 23:54:12 +0000 (23:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Jul 2014 23:54:12 +0000 (23:54 +0000)
* commit '2a70aba8460eff1bfb1417c271c6a5a53c560afa':
  Fix all resolv warnings and turn on -Werror.

1  2 
libc/dns/resolv/res_cache.c
libc/dns/resolv/res_send.c

Simple merge
Simple merge