tree dc4ff7668a6e055688c82b13e8bbc39a9a21f9f4
parent 0893d4918742db3b4bd8ef82c4f3008b60de9e2a
parent fe46030cdd97f9cf810630541df367dd2b85cae9
author Iliyan Malchev <malchev@google.com> 1254263333 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254263333 -0700

am fe46030c: Merge changes I3bd27087,I0c9ec550,I3a0e5e86 into eclair

Merge commit 'fe46030cdd97f9cf810630541df367dd2b85cae9' into eclair-plus-aosp

* commit 'fe46030cdd97f9cf810630541df367dd2b85cae9':
  bionic/linker: allow resolving of symbols from library back to executable
  bionic/linker: change lookup() to return soinfo, not base
  Revert "Revert "bionic/linker: fix symbol lookup during relocations""