am 0291b0ca: resolved conflicts for merge of 6774809b to gingerbread-plus-aosp

Merge commit '0291b0cada30c1c8eaaa346577969ff9b4eb5195'

* commit '0291b0cada30c1c8eaaa346577969ff9b4eb5195':
  linker: Support dlopen(NULL, ...) properly.
This commit is contained in:
David 'Digit' Turner
2010-07-26 12:21:19 -07:00
committed by Android Git Automerger
2 changed files with 14 additions and 1 deletions

View File

@@ -72,6 +72,8 @@ Differences between current and Android 2.2:
- Added an implementation of pthread_atfork()
- <dlfcn.h>: fixed dlopen() implementation to support dlopen(NULL, ...).
This allows one to look at the dynamic symbols exported by an executable.
-------------------------------------------------------------------------------
Differences between Android 2.2. and Android 2.1: