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)
Change-Id: I2fdb870ce012cedf1930644ce0ec47ce1a10a94c


Trivial merge