Merge branch 'tizen' into security-manager 26/58126/1
authorBartlomiej Grzelewski <b.grzelewski@samsung.com>
Wed, 27 Jan 2016 16:50:49 +0000 (17:50 +0100)
committerBartlomiej Grzelewski <b.grzelewski@samsung.com>
Wed, 27 Jan 2016 16:51:02 +0000 (17:51 +0100)
Change-Id: I1740cb2f5e0aa5de10952364e05b03a10c115b11


Trivial merge