Merge remote-tracking branch 'aosp/upstream-master' into mymerge

am: bab053dbca

Change-Id: I70f3c954701d0896f566c5a7b4ce6ab45ead7a15
This commit is contained in:
Nick Kralevich 2017-05-12 17:29:23 +00:00 committed by android-build-merger
commit 5734074732

View file

@ -22,8 +22,8 @@ static pthread_key_t destructor_key;
static int destructor_key_initialized = 0;
static __thread char destructor_initialized;
#ifndef __ANDROID__
/* Android declares this in unistd.h and has a definition for it */
#ifndef __BIONIC__
/* Bionic declares this in unistd.h and has a definition for it */
static pid_t gettid(void)
{
return syscall(__NR_gettid);