Merge "Remove stream type from AudioSystem::getRenderPosition()"

author Glenn Kasten <gkasten@google.com>

Wed, 26 Mar 2014 21:13:18 +0000 (21:13 +0000)

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

Wed, 26 Mar 2014 21:13:18 +0000 (21:13 +0000)
author Glenn Kasten <gkasten@google.com>
Wed, 26 Mar 2014 21:13:18 +0000 (21:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 26 Mar 2014 21:13:18 +0000 (21:13 +0000)
diff --cc include/media/AudioSystem.h
Simple merge
diff --cc media/libmedia/AudioSystem.cpp
Simple merge
author	Glenn Kasten <gkasten@google.com>
	Wed, 26 Mar 2014 21:13:18 +0000 (21:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 26 Mar 2014 21:13:18 +0000 (21:13 +0000)
		1	2
include/media/AudioSystem.h	patch \|	diff1 \|	diff2 \|	blob \| history
media/libmedia/AudioSystem.cpp	patch \|	diff1 \|	diff2 \|	blob \| history