Merge branch 'tizen' into tizen_4.0 90/158890/1
authorJiyong Min <jiyong.min@samsung.com>
Sun, 5 Nov 2017 23:30:53 +0000 (08:30 +0900)
committerJiyong Min <jiyong.min@samsung.com>
Sun, 5 Nov 2017 23:31:35 +0000 (08:31 +0900)
Change-Id: I40468f74b6dcd23b26b06c63b38fdf803e9cbbe2


Trivial merge