Merge branch 'devel/master' into tizen 58/175158/1
authorhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 05:48:08 +0000 (14:48 +0900)
committerhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 05:51:15 +0000 (14:51 +0900)
Change-Id: I915cb74621f4e6cab2152498344435a4381e4eba
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>

Trivial merge