tree 648c60d0e37b2e8b0bd482af34054a7ea77866af
parent 8d3c6b9faddfe63303c72dd050e25b9673a6e7d8
parent 132e8137590b4df54dae0baf0af7d9d00737e3ad
author Martijn Coenen <maco@google.com> 1396989859 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396989859 +0000

am 132e8137: Merge "nfc: replace pthread_cond_timedwait_monotonic_np"

* commit '132e8137590b4df54dae0baf0af7d9d00737e3ad':
  nfc: replace pthread_cond_timedwait_monotonic_np