am 0adc67df: Merge "audioflinger: fix crash when starting offload thread" into klp-dev

author Eric Laurent <elaurent@google.com>

Mon, 30 Sep 2013 21:12:28 +0000 (14:12 -0700)

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

Mon, 30 Sep 2013 21:12:28 +0000 (14:12 -0700)
author Eric Laurent <elaurent@google.com>
Mon, 30 Sep 2013 21:12:28 +0000 (14:12 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 30 Sep 2013 21:12:28 +0000 (14:12 -0700)
diff --cc services/audioflinger/Threads.cpp
Simple merge
diff --cc services/audioflinger/Threads.h
Simple merge
author	Eric Laurent <elaurent@google.com>
	Mon, 30 Sep 2013 21:12:28 +0000 (14:12 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 30 Sep 2013 21:12:28 +0000 (14:12 -0700)
		1	2
services/audioflinger/Threads.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/Threads.h	patch \|	diff1 \|	diff2 \|	blob \| history