am 77177fa2: am 95c03858: Merge "Allow releaseBuffer after flush" into klp-dev

author Glenn Kasten <gkasten@google.com>

Fri, 18 Oct 2013 22:09:03 +0000 (15:09 -0700)

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

Fri, 18 Oct 2013 22:09:03 +0000 (15:09 -0700)
author Glenn Kasten <gkasten@google.com>
Fri, 18 Oct 2013 22:09:03 +0000 (15:09 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 18 Oct 2013 22:09:03 +0000 (15:09 -0700)
diff --cc include/private/media/AudioTrackShared.h
Simple merge
diff --cc services/audioflinger/Tracks.cpp
Simple merge
author	Glenn Kasten <gkasten@google.com>
	Fri, 18 Oct 2013 22:09:03 +0000 (15:09 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 18 Oct 2013 22:09:03 +0000 (15:09 -0700)
		1	2
include/private/media/AudioTrackShared.h	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/Tracks.cpp	patch \|	diff1 \|	diff2 \|	blob \| history