Merge "Add GlowPadView extensions needed for lockscreen targets and nav ring." into cm-11.0
Merge "Add back navigation ring customization." into cm-11.0
Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/symbols.xml
Merge branch 'kitkat' of github.com:ModdedPA/android_frameworks_base into kitkat

Conflicts:
	core/res/res/values/pa_symbols.xml