Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/apps/osp/Settings into tizen_2.1
authorHongryeol Gil <hr.gil@samsung.com>
Thu, 18 Apr 2013 13:00:48 +0000 (22:00 +0900)
committerHongryeol Gil <hr.gil@samsung.com>
Thu, 18 Apr 2013 13:00:48 +0000 (22:00 +0900)
commit3c84cb12df265c14aa2653519d2e542f6f03a06b
treef137c79b1583e053934d32581f9ca803b0c96b57
parentb8609e9be9fd0bd099cdf80ba15128309f42f04c
parente58db875e4b7cc6aa2e467cda2081a7af7951e80
Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/apps/osp/Settings into tizen_2.1