Merge branch 'security-manager' into tizen 30/156730/1
authorZofia Abramowska <z.abramowska@samsung.com>
Thu, 19 Oct 2017 16:57:08 +0000 (18:57 +0200)
committerZofia Abramowska <z.abramowska@samsung.com>
Thu, 19 Oct 2017 16:57:15 +0000 (18:57 +0200)
Change-Id: I59af714f504f23c49c9fd7111afd1d4ff62bbd04


Trivial merge