OSDN Git Service

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

* commit 'c54109c0891cd6fc645d41ffdbbb4c9b6490bf00':
  Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."

Change-Id: I8746cdaa400cb9e0d3c9916fa32f4d35fbc9312a


Trivial merge