Merge "Change condition to enter silent mode."

author Eric Laurent <elaurent@google.com>

Wed, 31 Aug 2011 19:59:28 +0000 (12:59 -0700)

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

Wed, 31 Aug 2011 19:59:28 +0000 (12:59 -0700)
author Eric Laurent <elaurent@google.com>
Wed, 31 Aug 2011 19:59:28 +0000 (12:59 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 31 Aug 2011 19:59:28 +0000 (12:59 -0700)
diff --cc media/java/android/media/AudioService.java
Simple merge
author	Eric Laurent <elaurent@google.com>
	Wed, 31 Aug 2011 19:59:28 +0000 (12:59 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 31 Aug 2011 19:59:28 +0000 (12:59 -0700)