Merge branch 'devel/master' into tizen
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 10 Sep 2018 02:26:28 +0000 (11:26 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 10 Sep 2018 02:26:36 +0000 (11:26 +0900)
Change-Id: I19ac57a2d46782507d57cd96f2c9d5a68e82e1fd


Trivial merge