OSDN Git Service

am ee8faa5e: am 7f164f60: Merge "POSIX says pthread_mutex_trylock returns EBUSY,...
authorElliott Hughes <enh@google.com>
Wed, 29 Oct 2014 17:46:52 +0000 (17:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 17:46:52 +0000 (17:46 +0000)
commita4402ef6e68f7b790d49d3dbc6dad4a0893a2e37
treeb4d8021dcdaa1fd692d895fc0c0aa6cb21ec6a59
parentf63ce364a4cd2004f100ad2f683fe43edf1d1ede
parentee8faa5e74eadc12231f59f2bbe13cfa644922cd
am ee8faa5e: am 7f164f60: Merge "POSIX says pthread_mutex_trylock returns EBUSY, not EDEADLK."

* commit 'ee8faa5e74eadc12231f59f2bbe13cfa644922cd':
  POSIX says pthread_mutex_trylock returns EBUSY, not EDEADLK.