Merge "Have audio service clean up new receivers in crashing processes." into jb...

author Dianne Hackborn <hackbod@google.com>

Mon, 8 Apr 2013 20:09:18 +0000 (20:09 +0000)

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

Mon, 8 Apr 2013 20:10:37 +0000 (20:10 +0000)
author Dianne Hackborn <hackbod@google.com>
Mon, 8 Apr 2013 20:09:18 +0000 (20:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 8 Apr 2013 20:10:37 +0000 (20:10 +0000)
diff --cc media/java/android/media/AudioService.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Mon, 8 Apr 2013 20:09:18 +0000 (20:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 8 Apr 2013 20:10:37 +0000 (20:10 +0000)