Merge "AudioService: Fix problem handling USB audio disconnect" into jb-dev

author Mike Lockwood <lockwood@google.com>

Fri, 11 May 2012 00:58:47 +0000 (17:58 -0700)

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

Fri, 11 May 2012 00:58:47 +0000 (17:58 -0700)
author Mike Lockwood <lockwood@google.com>
Fri, 11 May 2012 00:58:47 +0000 (17:58 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 11 May 2012 00:58:47 +0000 (17:58 -0700)
diff --cc media/java/android/media/AudioService.java
Simple merge
author	Mike Lockwood <lockwood@google.com>
	Fri, 11 May 2012 00:58:47 +0000 (17:58 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 11 May 2012 00:58:47 +0000 (17:58 -0700)