tree 94cd2e21508f1b50725be01ef55acf72aa8ee2f0
parent f7d4cfe600383bc4d5c002986c40748299f05690
parent 50940c55d23b75fe15989497ee1446245e313214
author Tom Cherry <tomcherry@google.com> 1563399487 -0700
committer android-build-merger <android-build-merger@google.com> 1563399487 -0700

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

Change-Id: I82b753f8b48702989e957d6a23ed2413cd5a1b0c