Merge "audioservice: modify default music volume" into oc-dr1-dev am: b6f946c081

author Eric Laurent <elaurent@google.com>

Wed, 12 Jul 2017 17:47:33 +0000 (17:47 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 12 Jul 2017 17:47:33 +0000 (17:47 +0000)
author Eric Laurent <elaurent@google.com>
Wed, 12 Jul 2017 17:47:33 +0000 (17:47 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 17:47:33 +0000 (17:47 +0000)
diff --cc media/java/android/media/AudioSystem.java
Simple merge
diff --cc services/core/java/com/android/server/audio/AudioService.java
Simple merge
author	Eric Laurent <elaurent@google.com>
	Wed, 12 Jul 2017 17:47:33 +0000 (17:47 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 12 Jul 2017 17:47:33 +0000 (17:47 +0000)
		1	2
media/java/android/media/AudioSystem.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/audio/AudioService.java	patch \|	diff1 \|	diff2 \|	blob \| history