Merge "Volume policy updates."

author John Spurlock <jspurlock@google.com>

Fri, 13 Mar 2015 00:59:33 +0000 (00:59 +0000)

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

Fri, 13 Mar 2015 00:59:34 +0000 (00:59 +0000)
author John Spurlock <jspurlock@google.com>
Fri, 13 Mar 2015 00:59:33 +0000 (00:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 13 Mar 2015 00:59:34 +0000 (00:59 +0000)
diff --cc media/java/android/media/AudioManager.java
Simple merge
author	John Spurlock <jspurlock@google.com>
	Fri, 13 Mar 2015 00:59:33 +0000 (00:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 13 Mar 2015 00:59:34 +0000 (00:59 +0000)