telephony
Merge branch 'DevStream' of https://github.com/mittalprayag25/MSL.git
into DevStream

Conflicts:
	AndroidBuildingMusicPlayer/project.properties