Robert Greenwalt 777901424f resolved conflicts for merge of 9363d912 to honeycomb-plus-aosp ... Change-Id: I555f5c10da9770feacdbece9fd77729d6151bfba		2011-07-26 16:18:52 -07:00
..
inet	auto import from //depot/cupcake/@135843	2009-03-03 19:28:35 -08:00
isc	Remove compiler warnings when building Bionic.	2010-06-22 17:51:41 -07:00
nameser	Remove compiler warnings when building Bionic.	2010-06-22 17:51:41 -07:00
net	Tracking change to dns proxy protocol	2011-04-29 16:43:16 -07:00
resolv	resolved conflicts for merge of 9363d912 to honeycomb-plus-aosp	2011-07-26 16:18:52 -07:00
gethnamaddr.c	libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto.	2011-06-02 15:28:16 -07:00