am 965fa22d: am 039cd7e0: Merge "Add LOCAL_NO_FPIE."

author Tim Murray <timmurray@google.com>

Wed, 3 Sep 2014 23:07:46 +0000 (23:07 +0000)

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

Wed, 3 Sep 2014 23:07:46 +0000 (23:07 +0000)
author Tim Murray <timmurray@google.com>
Wed, 3 Sep 2014 23:07:46 +0000 (23:07 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 3 Sep 2014 23:07:46 +0000 (23:07 +0000)
diff --cc core/clear_vars.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Tim Murray <timmurray@google.com>
	Wed, 3 Sep 2014 23:07:46 +0000 (23:07 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 3 Sep 2014 23:07:46 +0000 (23:07 +0000)
		1	2
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history