Merge branch 'tizen_4.0' into tizen 22/167122/1 accepted/tizen/unified/20180116.074418 submit/tizen/20180115.103658
authorPiotr Kosko <p.kosko@samsung.com>
Mon, 15 Jan 2018 11:45:02 +0000 (12:45 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Mon, 15 Jan 2018 11:47:32 +0000 (12:47 +0100)
Change-Id: I5d8eda5627973d56f22e7090d80a9f0512cea209


Trivial merge