OSDN Git Service

Merge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."" am: a56257c66...
authorElliott Hughes <enh@google.com>
Fri, 22 Apr 2016 18:24:27 +0000 (18:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 18:24:27 +0000 (18:24 +0000)
am: 046256428f

* commit '046256428f82c8e48444906f8ac8aa5791603e29':
  Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."

Change-Id: Icbbdfe68e6a74ae57022769d786061713b084a14


Trivial merge