Merge branch 'security-manager' into tizen 81/155581/1
authorZofia Abramowska <z.abramowska@samsung.com>
Fri, 13 Oct 2017 15:13:58 +0000 (17:13 +0200)
committerZofia Abramowska <z.abramowska@samsung.com>
Fri, 13 Oct 2017 15:18:13 +0000 (17:18 +0200)
Change-Id: I4567f7cb3ea9713125ba7afd799aa17d0f634aaf


Trivial merge