Merge "Don't use control block frame count after create"

author Glenn Kasten <gkasten@google.com>

Fri, 16 Nov 2012 23:23:42 +0000 (15:23 -0800)

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

Fri, 16 Nov 2012 23:23:42 +0000 (15:23 -0800)
author Glenn Kasten <gkasten@google.com>
Fri, 16 Nov 2012 23:23:42 +0000 (15:23 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 16 Nov 2012 23:23:42 +0000 (15:23 -0800)
diff --cc media/libmedia/AudioTrack.cpp
Simple merge
diff --cc services/audioflinger/AudioFlinger.cpp
Simple merge
author	Glenn Kasten <gkasten@google.com>
	Fri, 16 Nov 2012 23:23:42 +0000 (15:23 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 16 Nov 2012 23:23:42 +0000 (15:23 -0800)
		1	2
media/libmedia/AudioTrack.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/AudioFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history