am d3d0beca: am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"

author Ying Wang <wangying@google.com>

Mon, 13 Aug 2012 23:26:06 +0000 (16:26 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Mon, 13 Aug 2012 23:26:06 +0000 (16:26 -0700)
author Ying Wang <wangying@google.com>
Mon, 13 Aug 2012 23:26:06 +0000 (16:26 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 13 Aug 2012 23:26:06 +0000 (16:26 -0700)
diff --cc core/Makefile
Simple merge
diff --cc target/product/core.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Mon, 13 Aug 2012 23:26:06 +0000 (16:26 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 13 Aug 2012 23:26:06 +0000 (16:26 -0700)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
target/product/core.mk	patch \|	diff1 \|	diff2 \|	blob \| history