tree 0e90640b373788691e646740783ae0b19061e5f5
parent 3134b56bb077d9dce1a8d49ac805878baef33603
parent b299039d060eb5f523c05e4f9b6934a6b897a54f
author David 'Digit' Turner <digit@android.com> 1300125189 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300125189 -0700

am b299039d: am e6e2ba1d: Merge "libc: <pthread.h>: Replace \'#if __cplusplus\' by \'#ifdef __cplusplus\'"

* commit 'b299039d060eb5f523c05e4f9b6934a6b897a54f':
  libc: <pthread.h>: Replace '#if __cplusplus' by '#ifdef __cplusplus'