Merge branch 'tizen' into tizen_4.0 submit/tizen_4.0/20171120.105656
authorMyungki Lee <mk5004.lee@samsung.com>
Mon, 20 Nov 2017 09:13:19 +0000 (18:13 +0900)
committerMyungki Lee <mk5004.lee@samsung.com>
Mon, 20 Nov 2017 09:13:19 +0000 (18:13 +0900)

Trivial merge