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

..

nsswitch.h

Moved private dns header to their own dir.

2014-03-03 20:40:41 +00:00

resolv_cache.h

Moved private dns header to their own dir.

2014-03-03 20:40:41 +00:00

resolv_iface.h

resolved conflicts for merge of 081db840 to klp-dev-plus-aosp

2014-03-21 15:46:39 -07:00

resolv_private.h

Moved private dns header to their own dir.

2014-03-03 20:40:41 +00:00

resolv_static.h

Moved private dns header to their own dir.

2014-03-03 20:40:41 +00:00