Chad Brubaker 836b490c76 resolved conflicts for merge of 081db840 to klp-dev-plus-aosp ... Change-Id: I3696d19a42bfafe5ce137f3333751b85fb434a2a		2014-03-21 15:46:39 -07:00
..
include	resolved conflicts for merge of 081db840 to klp-dev-plus-aosp	2014-03-21 15:46:39 -07:00
inet	Moved nameser.h and namser_compat.h to public include dir	2014-03-04 15:07:07 +00:00
nameser	Fix broken pointer overflow check ns_name_unpack()	2014-03-06 18:39:29 +00:00
net	Clean up reentrancy cruft.	2014-03-13 16:17:43 -07:00
resolv	resolved conflicts for merge of 081db840 to klp-dev-plus-aosp	2014-03-21 15:46:39 -07:00
gethnamaddr.c	Moved nameser.h and namser_compat.h to public include dir	2014-03-04 15:07:07 +00:00