am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."

author Ying Wang <wangying@google.com>

Tue, 10 Jun 2014 22:29:18 +0000 (22:29 +0000)

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

Tue, 10 Jun 2014 22:29:18 +0000 (22:29 +0000)
author Ying Wang <wangying@google.com>
Tue, 10 Jun 2014 22:29:18 +0000 (22:29 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 10 Jun 2014 22:29:18 +0000 (22:29 +0000)
diff --cc core/main.mk
Simple merge
diff --cc core/tasks/vendor_module_check.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Tue, 10 Jun 2014 22:29:18 +0000 (22:29 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 10 Jun 2014 22:29:18 +0000 (22:29 +0000)
		1	2
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/tasks/vendor_module_check.mk	patch \|	diff1 \|	diff2 \|	blob \| history