Merge "fix bug : N_SE-647 patchset7. remove merge conflict" into 2.0_beta
[apps/core/preloaded/settings.git] / org.tizen.setting.png
org.tizen.setting.png