OSDN Git Service

Merge "Remove pthread_mutex_lock_timeout_np from <pthread.h>."
authorElliott Hughes <enh@google.com>
Mon, 9 May 2016 20:32:36 +0000 (20:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 May 2016 20:32:36 +0000 (20:32 +0000)
commit209b22ae691390fefb269b0458accd1d6322a448
tree98ce8bc5fbac05c0519c0dc33236bbc7644314b6
parent6c8de255ec0db2005d4d55ef4c8d307ceedb5fa1
parentd2f3ce9c89715accb5b294f0c0a17b2a50656333
Merge "Remove pthread_mutex_lock_timeout_np from <pthread.h>."
am: d2f3ce9c89

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

Change-Id: I9850ac8d00439cfebc5812db4df0dbd46963e6f3