Merge "remove rsa only enum(SETTING_SCREEN_LOCK_TYPE_NONE)" into tizen_2.2
authorjungmin76.park <jungmin76.park@samsung.com>
Wed, 3 Jul 2013 06:59:39 +0000 (06:59 +0000)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Wed, 3 Jul 2013 06:59:39 +0000 (06:59 +0000)

Trivial merge