Aigaion/android_frameworks_base — pull request #3 by Aigaion (2014-12-27 21:26:43+00:00)
Title: Fix volume key music controls and wake up

- Forward port code from cm-11.0 and adjust for 5.0
- Fix not being able to adjust volume when music control is on
- Disable screen off volume/music control when wake key is enabled

Change-Id: Ie0ad83965c41fd33120490c25a4ff3d9b2cbeb37