am a3603693: Merge "Fix deadlock" into lmp-preview-dev

author Glenn Kasten <gkasten@google.com>

Mon, 16 Jun 2014 21:57:26 +0000 (21:57 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Mon, 16 Jun 2014 21:57:26 +0000 (21:57 +0000)
author Glenn Kasten <gkasten@google.com>
Mon, 16 Jun 2014 21:57:26 +0000 (21:57 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 16 Jun 2014 21:57:26 +0000 (21:57 +0000)
diff --cc services/audioflinger/Threads.cpp

index c0daa08,d22212b..d6390b1

mode 100755,100644..100755
--- 1/services/audioflinger/Threads.cpp
--- 2/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
author	Glenn Kasten <gkasten@google.com>
	Mon, 16 Jun 2014 21:57:26 +0000 (21:57 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 16 Jun 2014 21:57:26 +0000 (21:57 +0000)