Merge "Device encryption" into tizen
authorKiseok Chang <kiso.chang@samsung.com>
Fri, 24 Feb 2017 01:43:43 +0000 (17:43 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 24 Feb 2017 01:43:43 +0000 (17:43 -0800)

Trivial merge