Merge "Add a netd interface command to disable ND offload." into lmp-mr1-dev

author Lorenzo Colitti <lorenzo@google.com>

Thu, 30 Oct 2014 13:24:39 +0000 (13:24 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 30 Oct 2014 13:24:40 +0000 (13:24 +0000)
author Lorenzo Colitti <lorenzo@google.com>
Thu, 30 Oct 2014 13:24:39 +0000 (13:24 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 30 Oct 2014 13:24:40 +0000 (13:24 +0000)
diff --cc server/InterfaceController.cpp
Simple merge
diff --cc server/InterfaceController.h
Simple merge
author	Lorenzo Colitti <lorenzo@google.com>
	Thu, 30 Oct 2014 13:24:39 +0000 (13:24 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 30 Oct 2014 13:24:40 +0000 (13:24 +0000)
		1	2
server/InterfaceController.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
server/InterfaceController.h	patch \|	diff1 \|	diff2 \|	blob \| history