Merge branch 'tizen' into tizen_4.0
authorwchang kim <wchang.kim@samsung.com>
Sun, 10 Sep 2017 23:51:22 +0000 (08:51 +0900)
committerwchang kim <wchang.kim@samsung.com>
Sun, 10 Sep 2017 23:51:22 +0000 (08:51 +0900)

Trivial merge