Merge "Don't double destruct audio_track_cblk_t"

author Glenn Kasten <gkasten@google.com>

Wed, 8 Feb 2012 16:40:15 +0000 (08:40 -0800)

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

Wed, 8 Feb 2012 16:40:15 +0000 (08:40 -0800)
author Glenn Kasten <gkasten@google.com>
Wed, 8 Feb 2012 16:40:15 +0000 (08:40 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 8 Feb 2012 16:40:15 +0000 (08:40 -0800)
diff --cc services/audioflinger/AudioFlinger.cpp
Simple merge
author	Glenn Kasten <gkasten@google.com>
	Wed, 8 Feb 2012 16:40:15 +0000 (08:40 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 8 Feb 2012 16:40:15 +0000 (08:40 -0800)