Merge branch 'tizen_4.0' into tizen 94/171394/1
authorPiotr Kosko <p.kosko@samsung.com>
Fri, 2 Mar 2018 09:28:56 +0000 (10:28 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Fri, 2 Mar 2018 09:33:12 +0000 (10:33 +0100)
commitdf306b8a8736731c917646ece6dd649d4d99c37b
tree9c00c576f6175a74ab6e823f6cadf81e909efaa6
parenta02faea88416de035219406ba5b98f4c98dc0dae
parentf4f0a33a8a66006a086ec35d6868d78c8f1c7979
Merge branch 'tizen_4.0' into tizen

Change-Id: Ifc958be5c7bdc15406c506758b8bd08c1a7dbc05