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)
commitd3c8edc096df5693eb91c0d57e766de1c521f476
tree315c1e39eaed1f06f80a328d47afe9c7d629a6f9
parent89ed15a457758b6bac5d2b157820a3a1f628f05c
parentc5cb3658f18ee7c3d0704a40065cd751554766da
Merge branch 'tizen' into security-manager

Change-Id: I1740cb2f5e0aa5de10952364e05b03a10c115b11