OSDN Git Service

Persist master volume mute across reboot am: c1205111a9
authorTony Mak <tonymak@google.com>
Mon, 25 Jul 2016 10:45:02 +0000 (10:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 10:45:02 +0000 (10:45 +0000)
am: c33b549af8

Change-Id: Id5e57ebdf81824af0f86854d8668a05f8109e0e1

1  2 
core/java/android/os/UserManager.java
services/core/java/com/android/server/audio/AudioService.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

Simple merge