pixelfreak2005/liquid_android_frameworks_base — pull request #15 by pixelfreak2005 (2014-08-03 09:43:46+00:00)
Title: Framework: Quiet Hours System Sounds (1/2)

Conflicts:
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

modified: core/java/android/provider/Settings.java
modified: core/java/android/view/VolumePanel.java
modified: media/java/android/media/AudioManager.java
modified: packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
modified: packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
Change-Id: I12756da4904784d240f6f2980dc05ddf339e2c5f
modified: core/java/android/provider/Settings.java
modified: core/java/android/view/VolumePanel.java
modified: media/java/android/media/AudioManager.java
modified: packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
modified: packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java