Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.2-test

Conflicts:
	core/res/res/values/symbols.xml
	packages/SystemUI/res/values/attrs.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/PowerWidget.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/SleepButton.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java