Merge branch 'master' of slp-scm.sec.samsung.net:/tizen1/api/location-manager