Merge branch 'tizen' into security-manager 82/162482/1
authorZofia Grzelewska <z.abramowska@samsung.com>
Fri, 1 Dec 2017 16:21:37 +0000 (17:21 +0100)
committerZofia Grzelewska <z.abramowska@samsung.com>
Fri, 1 Dec 2017 16:21:42 +0000 (17:21 +0100)
commita60e91786380eb83c5f01d0b2c5aa3c0e422914b
tree0098fd3c8c4aab093f94d062fc56c23d35f67ed0
parentcd52a30f685fabf4411973807bb54870ca46c4e8
parent8f398c8d86f52c099fdd9d93172e7a3b9ff5e867
Merge branch 'tizen' into security-manager

Change-Id: If8ea6d9e0dcfbe8bd530f31f262226dd434117a5