OSDN Git Service

Merge "Expose pthread_mutex_lock_timeout_np to the NDK."
authorDan Albert <danalbert@google.com>
Thu, 15 Jun 2017 16:24:14 +0000 (16:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Jun 2017 16:24:14 +0000 (16:24 +0000)
am: a09953e1a8

Change-Id: Ic8117f6a86d8758e353f3a8e81d44d591dbe2129


Trivial merge