Merge branch 'jellybean' of https://github.com/JBMiniProject/android_packages_apps_Settings into jellybean

Conflicts:
	res/layout-ldpi/dev_card.xml
fix conflict
Merge branch 'jellybean' of https://github.com/JBMiniProject/android_packages_apps_Settings into jellybean

Conflicts:
	res/layout-ldpi/dev_card.xml