OSDN Git Service

Fix bad merge of 64e9e71cdb7d88397e510e1986d494b797ed3b45.
authorElliott Hughes <enh@google.com>
Tue, 23 Jun 2015 16:14:16 +0000 (09:14 -0700)
committerElliott Hughes <enh@google.com>
Tue, 23 Jun 2015 16:14:16 +0000 (09:14 -0700)
commit2b028f5ce47b8d27ca6d3b86e135f7d9b0359547
treef0340cfddde5600b2d547eba9338b78f25ad4df1
parentd6d6c0c4f10c047b25b45289f5c30338cd1da239
Fix bad merge of 64e9e71cdb7d88397e510e1986d494b797ed3b45.

Bug: http://b/22029751
Change-Id: I6245fe5f274c9af8a632da5eebe50cf9fe29dc4a
libc/include/pthread.h