git.osdn.net Git - android-x86/system-netd.git/commitdiff

author	Tom Cherry <tomcherry@google.com>
	Fri, 21 Aug 2015 18:24:15 +0000 (18:24 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 21 Aug 2015 18:24:15 +0000 (18:24 +0000)

* commit '8246d45e94bfb0ce878f41a01602b7b8d78c40ad':
bundle init.rc contents with its service

		1	2
server/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

system/netd

About OSDN

Find Software

Develop Software

Help