| commit | 1d3d0360eee442c7c73006e2069acdc051575edb | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Fri Mar 21 21:02:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 21 21:02:40 2014 +0000 |
| tree | bda3dd3ce78ee57f64b4f5921def386cdf194394 | |
| parent | 9061c82991bced72e88588803af4dab4da3d77af [diff] | |
| parent | 081db840befec895fb86e709ae95832ade2d065c [diff] |
am 081db840: Allow overlap in resolv uid => DNS iface mapping * commit '081db840befec895fb86e709ae95832ade2d065c': Allow overlap in resolv uid => DNS iface mapping