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)
commit577a87a8b3589a7793da4ae88f8cec159d40f099
treef6fda0833a5fdc94f7ff7e2232a1a14a740cb94a
parentd9b4aa1b29ceefb405667d726d887eaeb6e1de4f
parentb7fefb10ea66efa11b53e7f162a4e6133a520c60
Merge branch 'security-manager' into tizen

Change-Id: I59af714f504f23c49c9fd7111afd1d4ff62bbd04