From: Elliott Hughes <enh@google.com>
Date: Fri, 22 Apr 2016 18:29:52 +0000 (+0000)
Subject: Merge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."" am: a56257c66... 
X-Git-Tag: android-x86-8.1-r3~176
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4f6d83fb52990e824c47111b431740dbcec026ef;p=android-x86%2Fsystem-media.git

Merge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."" am: a56257c662 am: c54109c089 am: 046256428f
am: 3a998925bb

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

Change-Id: Id202f93ff96a8399513ced7f2d7c879233b7a221
---

4f6d83fb52990e824c47111b431740dbcec026ef