Merge "Sync code with tizen 2.4" into tizen
authorgs86.lee <gs86.lee@samsung.com>
Thu, 18 Feb 2016 03:01:20 +0000 (19:01 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 18 Feb 2016 03:01:20 +0000 (19:01 -0800)
1  2 
org.tizen.lockscreen.xml

Simple merge