Merge branch 'tizen' into tizen_4.0 40/155640/1
authorJiyong Min <jiyong.min@samsung.com>
Mon, 16 Oct 2017 01:55:42 +0000 (10:55 +0900)
committerJiyong Min <jiyong.min@samsung.com>
Mon, 16 Oct 2017 01:56:39 +0000 (10:56 +0900)
Change-Id: I735aa65e114f6ae522e887512611a3a89ae6aa0a


Trivial merge