Merge branch 'tizen' into tizen_4.0 submit/tizen_4.0/20180607.022826
authorJunghoon Park <jh9216.park@samsung.com>
Thu, 7 Jun 2018 02:24:55 +0000 (11:24 +0900)
committerJunghoon Park <jh9216.park@samsung.com>
Thu, 7 Jun 2018 02:24:55 +0000 (11:24 +0900)

Trivial merge