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:29:52 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 18:29:52 +0000 (18:29 +0000)
am: 3a998925bb

* commit '3a998925bbd21bb35252b7b97b23be794353cf61':
  Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."

Change-Id: Id202f93ff96a8399513ced7f2d7c879233b7a221


Trivial merge