Elliott Hughes 8ca1da6e71 resolved conflicts for merge of 62727429 to master ...

Change-Id: I8a3d167f3ef279a7c46cb8fb90c9477beff84d8e

2013-02-13 13:51:54 -08:00

..

inet

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

nameser

Remove compiler warnings when building Bionic.

2010-06-22 17:51:41 -07:00

net

resolved conflicts for merge of 62727429 to master

2013-02-13 13:51:54 -08:00

resolv

dns cache per interface iteration 2

2013-02-07 09:40:16 -08:00

gethnamaddr.c

dns cache per interface iteration 2

2013-02-07 09:40:16 -08:00