tree 82d16c3ed4ea84d00be75d9a4806f0aedeba5ce7
parent c00fafdb91760a4cdfbe9e5323b5165ab4c01b76
parent 221ea12c6303c7ea49a35763ed75037f1fa2990a
author Narayan Kamath <narayan@google.com> 1394223349 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394223349 +0000

am 221ea12c: am 2ea90b6d: Merge "Remove usage of pthread_cond_timedwait_monotonic_np."

* commit '221ea12c6303c7ea49a35763ed75037f1fa2990a':
  Remove usage of pthread_cond_timedwait_monotonic_np.