Merge branch 'security-manager' into tizen 24/59424/1
authorBartlomiej Grzelewski <b.grzelewski@samsung.com>
Mon, 15 Feb 2016 10:58:08 +0000 (11:58 +0100)
committerBartlomiej Grzelewski <b.grzelewski@samsung.com>
Mon, 15 Feb 2016 10:58:13 +0000 (11:58 +0100)
Change-Id: Ia22cf2876e6e034c74e135814523f43740b79501


Trivial merge