Merge CM
Stuff
Revert "[3/3]Settings: add "Accept all files" option for incoming files via Bluetooth"

This reverts commit c941669d2cf5a1cc0af62d31cca606e25cbde708.

Conflicts:
	res/values/cm_strings.xml
Get rid of Clone
Merge branch 'test' of https://github.com/AxxionKat/android_packages_apps_Settings into HEAD