Merge "Remove virtual from methods that don't need it"

author Glenn Kasten <gkasten@google.com>

Mon, 12 Mar 2012 22:05:21 +0000 (15:05 -0700)

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

Mon, 12 Mar 2012 22:05:21 +0000 (15:05 -0700)
author Glenn Kasten <gkasten@google.com>
Mon, 12 Mar 2012 22:05:21 +0000 (15:05 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 12 Mar 2012 22:05:21 +0000 (15:05 -0700)
diff --cc include/media/IAudioFlinger.h
Simple merge
diff --cc services/audioflinger/AudioFlinger.h
Simple merge
author	Glenn Kasten <gkasten@google.com>
	Mon, 12 Mar 2012 22:05:21 +0000 (15:05 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 12 Mar 2012 22:05:21 +0000 (15:05 -0700)
		1	2
include/media/IAudioFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/AudioFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history