Merge branch 'kk-ras-mr1.2_r2' of https://github.com/rascarlo/android_packages_apps_settings into kk

Conflicts:
	res/values/ras_strings.xml