Merge branch 'security-manager' into tizen 26/125226/2
authorZofia Abramowska <z.abramowska@samsung.com>
Fri, 14 Apr 2017 07:32:36 +0000 (09:32 +0200)
committerZofia Abramowska <z.abramowska@samsung.com>
Fri, 14 Apr 2017 07:36:56 +0000 (09:36 +0200)
Change-Id: I0f04e63fb07dd00e08c8ea8b595a14d2b04e3491


Trivial merge