Merge branch 'tizen' into tizen_4.0 accepted/tizen/4.0/unified/20180621.141449 submit/tizen_4.0/20180621.054459
authorJunghoon Park <jh9216.park@samsung.com>
Thu, 21 Jun 2018 05:40:24 +0000 (14:40 +0900)
committerJunghoon Park <jh9216.park@samsung.com>
Thu, 21 Jun 2018 05:40:24 +0000 (14:40 +0900)
Change-Id: Ie9002ee1a85138f421515e1ae8a8817d27dda555
Signed-off-by: Junghoon Park <jh9216.park@samsung.com>

Trivial merge