merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Apr 2010 16:10:08 +0000 (09:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Apr 2010 16:10:08 +0000 (09:10 -0700)
commit5ef5272be985dfdeafa86077c306f6b64d334240
treebad11901e83b227c7bac5e773ad6e06cf4eda089
parent95faecefdea0f55edafdba09052a904df7cd2405
parent1698d9ebfc7e27271852a1fdf305a2ac37b3ebe4
merge from open-source master

Change-Id: I518bb4ae9d7269957365561d4d609f22cde519db
linker/dlfcn.c
linker/linker.c