From: Hyejin Kim Date: Wed, 5 Sep 2012 07:02:40 +0000 (+0900) Subject: Merge "fix bug : N_SE-647 patchset7. remove merge conflict" into 2.0_beta X-Git-Tag: 2.0_alpha~37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33f08dacc68a209907e727db476df39d979f8c05;p=apps%2Fcore%2Fpreloaded%2Fsettings.git Merge "fix bug : N_SE-647 patchset7. remove merge conflict" into 2.0_beta --- 33f08dacc68a209907e727db476df39d979f8c05