resolved conflicts for merge of 6774809b to gingerbread-plus-aosp

Change-Id: I633c3067c874c215da0c6ede00af41d8e3587d8b

diff --cc libc/docs/CHANGES.TXT
index b13d8f7,d1d82de..e1eee4f
--- 1/libc/docs/CHANGES.TXT
--- 2/libc/docs/CHANGES.TXT
+++ b/libc/docs/CHANGES.TXT
@@@ -70,8 -70,8 +70,10 @@@ Differences between current and Androi
  - <sys/vfs.h>: fixed implementation of fstatfs() (also fixes fpathconf()
    which uses it).
  
 +- 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: