Merge remote-tracking branch 'aokp/jb-mr2' into aokp

Conflicts:
	core/res/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java