tree ffa49a0ca45a12a4f8c2af6cbc58e0774c6bf57b
parent eb329c07c150dfaf539d1d48bedf1572e963348f
parent 5b730570be2bd1f90346a5921d0b70dc11351396
author Jesse Hall <jessehall@google.com> 1421106106 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421106106 +0000

am 5b730570: Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"

* commit '5b730570be2bd1f90346a5921d0b70dc11351396':
  surfaceflinger: use Mutex timedLock instead of tryLock loop