am 893ed24d: am 387a9fee: am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation...

author Dimitry Ivanov <dimitry@google.com>

Thu, 23 Apr 2015 05:07:11 +0000 (05:07 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 23 Apr 2015 05:07:11 +0000 (05:07 +0000)
author Dimitry Ivanov <dimitry@google.com>
Thu, 23 Apr 2015 05:07:11 +0000 (05:07 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 23 Apr 2015 05:07:11 +0000 (05:07 +0000)
diff --cc core/clear_vars.mk
Simple merge
diff --cc core/config.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Dimitry Ivanov <dimitry@google.com>
	Thu, 23 Apr 2015 05:07:11 +0000 (05:07 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 23 Apr 2015 05:07:11 +0000 (05:07 +0000)
		1	2
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history