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)
commit9f4a36d7c674bcac2f60271556fbab5ddd5615c2
tree0654f68f86b59fcf9c184e1ae35e9afd41a741ab
parentc96e454948003646973b678be5e2ea9057fe0892
parent172747c7c388d09105f6788e0604b37f1e6df896
Merge branch 'security-manager' into tizen

Change-Id: I48f18681c2cc1a2bcba0ba09d4313fe418553358
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>