Resolved conflict fpr merge of 7d8574ce to master

Conflicts:
	libc/docs/CHANGES.TXT

Change-Id: I3816ac8346be399b31167b0374a0f018451bb92d

diff --cc libc/docs/CHANGES.TXT
index 6799525,ce43f1e..9407173
--- 1/libc/docs/CHANGES.TXT
--- 2/libc/docs/CHANGES.TXT
+++ b/libc/docs/CHANGES.TXT
@@@ -5,11 -5,9 +5,14 @@@ Differences between current and Androi
  
  - <pthread.h>: Add reader/writer locks implementation.
  
 +- <math.h>: Added sincos(), sincosf() and sincosl() (GLibc compatibility).
 +
 +- <sys/sysinfo.h>: Added missing sysinfo() system call implementation
 +  (the function was already declared in the header though).
 +
+ - <semaphore.h>: Use private futexes for semaphore implementation,
+   unless your set 'pshared' to non-0 when calling sem_init().
+ 
  -------------------------------------------------------------------------------
  Differences between Android 2.2. and Android 2.1: