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)
commitc42afaaba8b60252fc6aec22aa413a7b0d39a0e8
tree0289aef5d1b2e7231425986874331748a9093e7e
parentbd7c4954c7134b32df83569b2fd26959af313091
parent75dee99444dacfd26d337d09b9835fbd4a1c4a5f
Merge branch 'security-manager' into tizen

Change-Id: I0f04e63fb07dd00e08c8ea8b595a14d2b04e3491