Merge "build: Add support for defining products in /product"

author Gaurav Shah <gauravsh@google.com>

Mon, 2 Nov 2015 22:27:08 +0000 (22:27 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 2 Nov 2015 22:27:08 +0000 (22:27 +0000)
author Gaurav Shah <gauravsh@google.com>
Mon, 2 Nov 2015 22:27:08 +0000 (22:27 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 2 Nov 2015 22:27:08 +0000 (22:27 +0000)
diff --cc core/product.mk
Simple merge
diff --cc envsetup.sh
Simple merge
author	Gaurav Shah <gauravsh@google.com>
	Mon, 2 Nov 2015 22:27:08 +0000 (22:27 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 2 Nov 2015 22:27:08 +0000 (22:27 +0000)
		1	2
core/product.mk	patch \|	diff1 \|	diff2 \|	blob \| history
envsetup.sh	patch \|	diff1 \|	diff2 \|	blob \| history