OSDN Git Service

Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined." am: 187db58e0e
authorElliott Hughes <enh@google.com>
Fri, 22 Apr 2016 15:24:17 +0000 (15:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 15:24:17 +0000 (15:24 +0000)
commitcb13e37042c44f67ee54fbc26ab75d582671d03a
tree7a58a25b10b8be73c31f37bbf42de56aec0e0c04
parent3d3a71a5c961bd3b3bc14aabaaeab88da6bb49c8
parentce64f48faf7aa5250a5b8604116f5f52c8459327
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined." am: 187db58e0e
am: ce64f48faf

* commit 'ce64f48faf7aa5250a5b8604116f5f52c8459327':
  HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.

Change-Id: I393af6784dfc706ee186fb7a0dd7c40b9ce649d8