[1/3] TeloRadio frameworks_base
	* Defines preferences

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I35751e71ed8967357301f63ae4714e67ca42b280
Merge "[1/3] TeloRadio frameworks_base 	* Defines preferences" into kitkat