am 69c5d108: Revert "Add RTLD_NODELETE flag support"

author Dmitriy Ivanov <dimitry@google.com>

Tue, 4 Nov 2014 17:17:57 +0000 (17:17 +0000)

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

Tue, 4 Nov 2014 17:17:57 +0000 (17:17 +0000)
author Dmitriy Ivanov <dimitry@google.com>
Tue, 4 Nov 2014 17:17:57 +0000 (17:17 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 4 Nov 2014 17:17:57 +0000 (17:17 +0000)
diff --cc linker/linker.cpp
Simple merge
diff --cc tests/dlfcn_test.cpp
Simple merge
diff --cc tests/libs/Android.mk
Simple merge
author	Dmitriy Ivanov <dimitry@google.com>
	Tue, 4 Nov 2014 17:17:57 +0000 (17:17 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 4 Nov 2014 17:17:57 +0000 (17:17 +0000)
		1	2
linker/linker.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tests/dlfcn_test.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tests/libs/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history