Persist master volume mute across reboot am: c1205111a9

author Tony Mak <tonymak@google.com>

Mon, 25 Jul 2016 10:45:02 +0000 (10:45 +0000)

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

Mon, 25 Jul 2016 10:45:02 +0000 (10:45 +0000)
author Tony Mak <tonymak@google.com>
Mon, 25 Jul 2016 10:45:02 +0000 (10:45 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 10:45:02 +0000 (10:45 +0000)
diff --cc core/java/android/os/UserManager.java
Simple merge
diff --cc services/core/java/com/android/server/audio/AudioService.java
Simple merge
diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
author	Tony Mak <tonymak@google.com>
	Mon, 25 Jul 2016 10:45:02 +0000 (10:45 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 25 Jul 2016 10:45:02 +0000 (10:45 +0000)
		1	2
core/java/android/os/UserManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/audio/AudioService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history