Merge branch 'devel/master' into tizen 48/175148/1
authorhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 05:24:09 +0000 (14:24 +0900)
committerhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 05:24:20 +0000 (14:24 +0900)
Change-Id: I14e4b9c06cdca47c90ccdcf879116d97504745cc
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>

Trivial merge