Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of binaries" am: 2f8ffa61be...

author Shinichiro Hamaji <hamaji@google.com>

Thu, 5 Nov 2015 01:33:46 +0000 (01:33 +0000)

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

Thu, 5 Nov 2015 01:33:46 +0000 (01:33 +0000)
author Shinichiro Hamaji <hamaji@google.com>
Thu, 5 Nov 2015 01:33:46 +0000 (01:33 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 5 Nov 2015 01:33:46 +0000 (01:33 +0000)
diff --cc core/base_rules.mk
Simple merge
diff --cc core/config.mk
Simple merge
author	Shinichiro Hamaji <hamaji@google.com>
	Thu, 5 Nov 2015 01:33:46 +0000 (01:33 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 5 Nov 2015 01:33:46 +0000 (01:33 +0000)
		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history