Merge "Use hermetic ckati/makeparallel prebuilts"

author Dan Willemsen <dwillemsen@google.com>

Thu, 10 Mar 2016 07:28:56 +0000 (07:28 +0000)

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

Thu, 10 Mar 2016 07:28:56 +0000 (07:28 +0000)
author Dan Willemsen <dwillemsen@google.com>
Thu, 10 Mar 2016 07:28:56 +0000 (07:28 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 10 Mar 2016 07:28:56 +0000 (07:28 +0000)
diff --cc core/config.mk
Simple merge
diff --cc core/ninja.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Thu, 10 Mar 2016 07:28:56 +0000 (07:28 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 10 Mar 2016 07:28:56 +0000 (07:28 +0000)
		1	2
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/ninja.mk	patch \|	diff1 \|	diff2 \|	blob \| history