Merge branch 'security-manager' into tizen 06/38606/3
authorPawel Wieczorek <p.wieczorek2@samsung.com>
Thu, 23 Apr 2015 08:15:43 +0000 (10:15 +0200)
committerPawel Wieczorek <p.wieczorek2@samsung.com>
Thu, 23 Apr 2015 08:15:59 +0000 (10:15 +0200)
Change-Id: I48f18681c2cc1a2bcba0ba09d4313fe418553358
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>

Trivial merge