Merge branch 'devel/master' into tizen 21/181221/1
authorWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 06:01:42 +0000 (15:01 +0900)
committerWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 06:02:01 +0000 (15:02 +0900)
Change-Id: I46f1bb55620dcb4158fc28c31f699f47ed8dd0a3


Trivial merge