am 1d3d0360: am 081db840: Allow overlap in resolv uid => DNS iface mapping
authorChad Brubaker <cbrubaker@google.com>
Fri, 21 Mar 2014 21:09:37 +0000 (21:09 +0000)
committerAndroid 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

1  2 
libc/dns/include/resolv_iface.h
libc/dns/resolv/res_cache.c

Simple merge
Simple merge