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

Conflicts:
	Android.mk
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/pie/PieInputFilter.java