Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1

	modified:   core/java/android/os/PowerManager.java
	modified:   core/java/android/provider/Settings.java
	modified:   core/java/com/android/internal/util/aokp/AokpRibbonHelper.java
	modified:   packages/SystemUI/src/com/android/systemui/aokp/AokpSwipeRibbon.java