fix bug : N_SE-647
authorHyejin Kim <hyejin0906.kim@samsung.com>
Fri, 31 Aug 2012 08:51:38 +0000 (17:51 +0900)
committerHyejin Kim <hyejin0906.kim@samsung.com>
Wed, 5 Sep 2012 02:21:29 +0000 (11:21 +0900)
commitb078734a6a8edb231e47ced94d46f2bead2efd5e
tree67e3f95ba7f10e675b75dc7d33bb0a68fd42c823
parentec0932eae9459c5f53767ec9f6d0c0d7ab29f995
fix bug : N_SE-647
patchset7. remove merge conflict

Change-Id: I4057718ebad8239367ac684872c15ec18c46de48
packaging/settings.spec
setting-profile/include/setting-profile.h
setting-profile/src/setting-profile-sound-main.c
setting-profile/src/setting-profile.c