Merge "Lokcscreen module" into tizen
authorKiseok Chang <kiso.chang@samsung.com>
Mon, 5 Dec 2016 06:58:36 +0000 (22:58 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 5 Dec 2016 06:58:37 +0000 (22:58 -0800)

Trivial merge