author | Elliott Hughes <enh@google.com> | |
Wed, 2 Jul 2014 23:54:12 +0000 (23:54 +0000) | ||
committer | Android Git Automerger <android-git-automerger@android.com> | |
Wed, 2 Jul 2014 23:54:12 +0000 (23:54 +0000) |
1 | 2 | |||
---|---|---|---|---|
libc/dns/resolv/res_cache.c | patch | | diff1 | | diff2 | | blob | history |
libc/dns/resolv/res_send.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc libc/dns/resolv/res_cache.c
Simple merge
diff --cc libc/dns/resolv/res_send.c
Simple merge