Merge "Read Soong-exported configuration" am: c7b610a67e

author Dan Willemsen <dwillemsen@google.com>

Fri, 13 May 2016 01:43:09 +0000 (01:43 +0000)

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

Fri, 13 May 2016 01:43:09 +0000 (01:43 +0000)
author Dan Willemsen <dwillemsen@google.com>
Fri, 13 May 2016 01:43:09 +0000 (01:43 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 13 May 2016 01:43:09 +0000 (01:43 +0000)
diff --cc core/main.mk
Simple merge
diff --cc core/ninja.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Fri, 13 May 2016 01:43:09 +0000 (01:43 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 13 May 2016 01:43:09 +0000 (01:43 +0000)
		1	2
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/ninja.mk	patch \|	diff1 \|	diff2 \|	blob \| history