am e27347e7: Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds"

author Ying Wang <wangying@google.com>

Tue, 11 Oct 2011 17:04:27 +0000 (10:04 -0700)

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

Tue, 11 Oct 2011 17:04:27 +0000 (10:04 -0700)
author Ying Wang <wangying@google.com>
Tue, 11 Oct 2011 17:04:27 +0000 (10:04 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 11 Oct 2011 17:04:27 +0000 (10:04 -0700)
diff --cc core/main.mk
Simple merge
diff --cc target/product/generic_no_telephony.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Tue, 11 Oct 2011 17:04:27 +0000 (10:04 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 11 Oct 2011 17:04:27 +0000 (10:04 -0700)
		1	2
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history
target/product/generic_no_telephony.mk	patch \|	diff1 \|	diff2 \|	blob \| history