Merge branch 'tizen' into tizen_4.0 accepted/tizen/4.0/unified/20170921.024742 submit/tizen_4.0/20170920.215811
authorwchang kim <wchang.kim@samsung.com>
Wed, 20 Sep 2017 21:53:14 +0000 (06:53 +0900)
committerwchang kim <wchang.kim@samsung.com>
Wed, 20 Sep 2017 21:53:14 +0000 (06:53 +0900)

Trivial merge