OSDN Git Service

Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)." am: 80a9411
authorElliott Hughes <enh@google.com>
Mon, 25 Apr 2016 15:04:42 +0000 (15:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:04:42 +0000 (15:04 +0000)
am: 9662b91

* commit '9662b91edf0f1012dd90cce37a08f9d15ed6531e':
  HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two).

Change-Id: I539636ac04ea6d3f742b62e1ca24b9ee4533fb26


Trivial merge