test
Merge branch 'cm-11.0' of github.com:android-legacy/android_device_samsung_s6500d into cm-11.0

Conflicts:
	system.prop