am 45075cf6: Merge "Generate installed-files-vendor.txt"

author Ying Wang <wangying@android.com>

Tue, 15 Sep 2015 23:10:16 +0000 (23:10 +0000)

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

Tue, 15 Sep 2015 23:10:16 +0000 (23:10 +0000)
author Ying Wang <wangying@android.com>
Tue, 15 Sep 2015 23:10:16 +0000 (23:10 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 15 Sep 2015 23:10:16 +0000 (23:10 +0000)
diff --cc core/Makefile
Simple merge
diff --cc core/main.mk
Simple merge
author	Ying Wang <wangying@android.com>
	Tue, 15 Sep 2015 23:10:16 +0000 (23:10 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 15 Sep 2015 23:10:16 +0000 (23:10 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history