Merge "AudioFlinger: fix crash when deleting pre process."

author Eric Laurent <elaurent@google.com>

Wed, 27 Jul 2011 16:48:47 +0000 (09:48 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 27 Jul 2011 16:48:47 +0000 (09:48 -0700)
author Eric Laurent <elaurent@google.com>
Wed, 27 Jul 2011 16:48:47 +0000 (09:48 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 Jul 2011 16:48:47 +0000 (09:48 -0700)
diff --cc services/audioflinger/AudioFlinger.cpp
Simple merge
diff --cc services/audioflinger/AudioFlinger.h
Simple merge
author	Eric Laurent <elaurent@google.com>
	Wed, 27 Jul 2011 16:48:47 +0000 (09:48 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 Jul 2011 16:48:47 +0000 (09:48 -0700)
		1	2
services/audioflinger/AudioFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/AudioFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history