Merge branch 'jellybean-legacy' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean-legacy

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/strings.xml
	services/java/com/android/server/am/ActivityStack.java

Change-Id: Ifd0706728a8c382fa10a44355e90ce30e80afb9f
Merge branch 'jellybean-legacy' of https://github.com/bryan2894/android_frameworks_base into jellybean-legacy