OSDN Git Service

Merge "Remove pthread_mutex_lock_timeout_np from <pthread.h>." am: d2f3ce9c89
authorElliott Hughes <enh@google.com>
Mon, 9 May 2016 20:37:54 +0000 (20:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 May 2016 20:37:54 +0000 (20:37 +0000)
commitf5fd82eb26af54418a13cff121af74fa3b7528b9
tree7456ca12b5ee9be97a0bce3e53345eedde1c18e6
parent3efddd4b9e7571722cc9475e07d43b5fb100d47e
parent209b22ae691390fefb269b0458accd1d6322a448
Merge "Remove pthread_mutex_lock_timeout_np from <pthread.h>." am: d2f3ce9c89
am: 209b22ae69

* commit '209b22ae691390fefb269b0458accd1d6322a448':
  Remove pthread_mutex_lock_timeout_np from <pthread.h>.

Change-Id: I8d95b44a0ec3a23481aca3c3d81ab6feec43042d