am 9b996f80: am eb9b62e0: Merge "Make -rpath-link work with multilib."

author Ying Wang <wangying@google.com>

Sat, 22 Feb 2014 00:58:46 +0000 (00:58 +0000)

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

Sat, 22 Feb 2014 00:58:46 +0000 (00:58 +0000)
author Ying Wang <wangying@google.com>
Sat, 22 Feb 2014 00:58:46 +0000 (00:58 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Sat, 22 Feb 2014 00:58:46 +0000 (00:58 +0000)
diff --cc core/combo/TARGET_linux-arm.mk
Simple merge
diff --cc core/config.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Sat, 22 Feb 2014 00:58:46 +0000 (00:58 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sat, 22 Feb 2014 00:58:46 +0000 (00:58 +0000)
		1	2
core/combo/TARGET_linux-arm.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history