Merge "audioflinger: implement getTimestamp() for offloaded tracks" into klp-dev

author Eric Laurent <elaurent@google.com>

Fri, 20 Sep 2013 16:56:33 +0000 (16:56 +0000)

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

Fri, 20 Sep 2013 16:56:34 +0000 (16:56 +0000)
author Eric Laurent <elaurent@google.com>
Fri, 20 Sep 2013 16:56:33 +0000 (16:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 20 Sep 2013 16:56:34 +0000 (16:56 +0000)
diff --cc services/audioflinger/Threads.cpp
Simple merge
diff --cc services/audioflinger/Threads.h
Simple merge
diff --cc services/audioflinger/Tracks.cpp
Simple merge
author	Eric Laurent <elaurent@google.com>
	Fri, 20 Sep 2013 16:56:33 +0000 (16:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 20 Sep 2013 16:56:34 +0000 (16:56 +0000)
		1	2
services/audioflinger/Threads.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/Threads.h	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/Tracks.cpp	patch \|	diff1 \|	diff2 \|	blob \| history