am 738871f6: am e886392c: am 37a44faa: Merge "Store native libs aligned to PAGE_SIZE"

author Narayan Kamath <narayan@google.com>

Thu, 26 Feb 2015 12:58:11 +0000 (12:58 +0000)

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

Thu, 26 Feb 2015 12:58:11 +0000 (12:58 +0000)
author Narayan Kamath <narayan@google.com>
Thu, 26 Feb 2015 12:58:11 +0000 (12:58 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 26 Feb 2015 12:58:11 +0000 (12:58 +0000)
diff --cc core/clear_vars.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
diff --cc core/package_internal.mk
Simple merge
diff --cc core/prebuilt_internal.mk
Simple merge
author	Narayan Kamath <narayan@google.com>
	Thu, 26 Feb 2015 12:58:11 +0000 (12:58 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 26 Feb 2015 12:58:11 +0000 (12:58 +0000)
		1	2
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/package_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/prebuilt_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history