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)
commitd2ab50b042f76131e4432a74c9488fce32e5d75a
tree4f1c0552ad8d00bc1aafe4a19e9b30993e107b73
parent9e0ddfcec1db84d92e37dc7bf915686e8e0f903b
parent05807310787df35ee334c36da98140568def2341
Merge "Sync code with tizen 2.4" into tizen
org.tizen.lockscreen.xml