Merge branch 'tizen' into security-manager 04/178004/1
authorDariusz Michaluk <d.michaluk@samsung.com>
Mon, 7 May 2018 08:48:29 +0000 (10:48 +0200)
committerDariusz Michaluk <d.michaluk@samsung.com>
Mon, 7 May 2018 08:48:41 +0000 (10:48 +0200)
Change-Id: I8aff6f1193ac928ed36593d5f2e3f560ccfb6da6


Trivial merge