tree 773f4afb339e00a01475412894bd3eace6fb7786
parent 28175b0221ae0b1e2e0997419051ba3d24bb0e1b
parent 7208a01514284becbd32cf4dfd256e4b10448f8e
author Jesse Hall <jessehall@google.com> 1420654320 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420654320 +0000

am 7208a015: Merge "Mutex: add timedLock() method"

* commit '7208a01514284becbd32cf4dfd256e4b10448f8e':
  Mutex: add timedLock() method