Merge branch 'tizen' into security-manager 23/156723/1
authorZofia Abramowska <z.abramowska@samsung.com>
Thu, 19 Oct 2017 15:39:54 +0000 (17:39 +0200)
committerZofia Abramowska <z.abramowska@samsung.com>
Thu, 19 Oct 2017 15:41:29 +0000 (17:41 +0200)
Change-Id: I3fa314322c8005c432cbdcfca15043d3679622b9


Trivial merge