Merge "suspended() and isSuspended() are const"

author Glenn Kasten <gkasten@google.com>

Mon, 9 Jan 2012 18:24:09 +0000 (10:24 -0800)

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

Mon, 9 Jan 2012 18:24:09 +0000 (10:24 -0800)
author Glenn Kasten <gkasten@google.com>
Mon, 9 Jan 2012 18:24:09 +0000 (10:24 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 9 Jan 2012 18:24:09 +0000 (10:24 -0800)
diff --cc services/audioflinger/AudioFlinger.cpp
Simple merge
author	Glenn Kasten <gkasten@google.com>
	Mon, 9 Jan 2012 18:24:09 +0000 (10:24 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 9 Jan 2012 18:24:09 +0000 (10:24 -0800)