Merge branch 'tizen_4.0' into tizen 37/173737/1
authorPiotr Kosko <p.kosko@samsung.com>
Fri, 23 Mar 2018 12:37:07 +0000 (13:37 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Fri, 23 Mar 2018 12:37:12 +0000 (13:37 +0100)
Change-Id: I0c449ee349da1f34fbed2243ac0a6616b7b70717


Trivial merge