tree 7d985e447f1a688a16d7323e914dd51c68e9023b
parent d7e8118bff7ccd814e83afe10de709bde369c6ba
parent 9c22ac77e41b8bbddbb64959acabce3f3a07345d
author Jesse Hall <jessehall@google.com> 1421181148 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421181148 +0000

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

* commit '9c22ac77e41b8bbddbb64959acabce3f3a07345d':
  surfaceflinger: use Mutex timedLock instead of tryLock loop