Merge branch 'tizen' into security-manager 34/41134/1
authorTomasz Swierczek <t.swierczek@samsung.com>
Thu, 11 Jun 2015 08:40:00 +0000 (10:40 +0200)
committerTomasz Swierczek <t.swierczek@samsung.com>
Thu, 11 Jun 2015 08:41:01 +0000 (10:41 +0200)
commita3bce0cb1e5bb0e889087f9fdfd07c25dc3a202e
treebf559fc213097ccd468f9ff28d2f8d00b6c74287
parent172747c7c388d09105f6788e0604b37f1e6df896
parente68270bf7d1c27f5d00d8f3d00da3dca1502edbf
Merge branch 'tizen' into security-manager

Change-Id: I2fdb870ce012cedf1930644ce0ec47ce1a10a94c