Merge commit 'refs/changes/90/3990/1' of https://gerrit.slimroms.net/SlimRoms/frameworks_base into kk4.4

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java