Merge branch 'devel/master' into tizen_4.0 96/148996/1
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 11 Sep 2017 08:52:37 +0000 (17:52 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 11 Sep 2017 08:52:40 +0000 (17:52 +0900)
Change-Id: I9491fe28a2fda34d3152c2a78dea3721756f5bf1


Trivial merge