OSDN Git Service
(root)
/
android-x86
/
system-media.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2749d6a
815de96
)
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)." am: 80a9411...
author
Elliott Hughes
<enh@google.com>
Mon, 25 Apr 2016 15:43:56 +0000
(15:43 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 25 Apr 2016 15:43:56 +0000
(15:43 +0000)
am:
815de96
* commit '
815de9685a416d8db15646fc4eae777ba7bac16e
':
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two).
Change-Id: I3de07557169b20aec4f7624608ba3fd79fb1e8b7
Trivial merge