Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	core/res/res/values/cm_strings.xml
	core/res/res/values/symbols.xml
	policy/src/com/android/internal/policy/impl/GlobalActions.java