tree 94cd2e21508f1b50725be01ef55acf72aa8ee2f0
parent 0346130300d1be20a093063a3ed03ad7f1fab125
parent 3b6760351fd35e548ac8ff6be8fac4013b84e81d
author Tom Cherry <tomcherry@google.com> 1563400634 -0700
committer android-build-merger <android-build-merger@google.com> 1563400634 -0700

Merge "Fix pthread_cond_clockwait() when cond is initialized with CLOCK_MONOTONIC" am: 09ecb00b86 am: 50940c55d2 am: 2aca38c5a8
am: 3b6760351f

Change-Id: Iffbe6614b5c0e5c264280072fc56e01875cd5232