Add long press back button to kill app in Developer Options (2/2)
Merge branch 'lp' of https://github.com/BrokenOs/packages_apps_Settings into traines

Conflicts:
	src/com/android/settings/DevelopmentSettings.java