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


Trivial merge