Elliott Hughes 9110eaab41 resolve merge conflicts of 847d963 to nyc-dev-plus-aosp ... Change-Id: Ib97f56112bff71e2997116f969fd6d3e30e72f26		2016-05-18 21:26:35 -07:00
..
include/netutils	resolve merge conflicts of 847d963 to nyc-dev-plus-aosp	2016-05-18 21:26:35 -07:00
Android.mk	Merge "Delete dhcpcd code in system/core, since dhcpcd is no more." into nyc-dev	2016-02-25 07:57:34 +00:00
dhcpclient.c	Move sprintf to snprintf.	2015-02-17 19:27:51 -08:00
dhcpmsg.c	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
dhcpmsg.h	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00
dhcptool.c	Remove a dead header (<netutils/dhcp.h>).	2016-05-18 14:22:15 -07:00
ifc_utils.c	Merge "Set IFA_BROADCAST during IPv4 RTM_NEWADDRs" am: d709914	2016-03-31 07:10:47 +00:00
NOTICE	Automated import from //branches/master/...@140824,140824	2009-03-24 18:36:50 -07:00
packet.c	Add missing <malloc.h> and <string.h> includes.	2015-01-28 11:37:57 -08:00
packet.h	auto import from //depot/cupcake/@135843	2009-03-03 19:32:55 -08:00