| author | Chad Brubaker <cbrubaker@google.com> | |
| Fri, 21 Mar 2014 21:09:37 +0000 (21:09 +0000) | ||
| committer | Android Git Automerger <android-git-automerger@android.com> | |
| Fri, 21 Mar 2014 21:09:37 +0000 (21:09 +0000) |
* commit '1d3d0360eee442c7c73006e2069acdc051575edb':
Allow overlap in resolv uid => DNS iface mapping
Allow overlap in resolv uid => DNS iface mapping
| 1 | 2 | |||
|---|---|---|---|---|
| libc/dns/include/resolv_iface.h | patch | | diff1 | | diff2 | | blob | history |
| libc/dns/resolv/res_cache.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc libc/dns/include/resolv_iface.h
Simple merge
diff --cc libc/dns/resolv/res_cache.c
Simple merge