Merge "Fix GET-INSTALL-PATH to work with Soong"

author Dan Willemsen <dwillemsen@google.com>

Mon, 15 Aug 2016 21:17:33 +0000 (21:17 +0000)

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

Mon, 15 Aug 2016 21:17:33 +0000 (21:17 +0000)
author Dan Willemsen <dwillemsen@google.com>
Mon, 15 Aug 2016 21:17:33 +0000 (21:17 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 15 Aug 2016 21:17:33 +0000 (21:17 +0000)
diff --cc core/envsetup.mk
Simple merge
diff --cc core/main.mk
Simple merge
diff --cc core/ninja.mk
Simple merge
diff --cc envsetup.sh
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Mon, 15 Aug 2016 21:17:33 +0000 (21:17 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 15 Aug 2016 21:17:33 +0000 (21:17 +0000)
		1	2
core/envsetup.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/ninja.mk	patch \|	diff1 \|	diff2 \|	blob \| history
envsetup.sh	patch \|	diff1 \|	diff2 \|	blob \| history