compatibility fix for Samsung 2.3.x devices
use of spaces instead of tabs
Merge branch 'andacaydin-master' into dev