Merge branch 'devel/master' into tizen_4.0 38/155738/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 05:06:06 +0000 (14:06 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 05:06:13 +0000 (14:06 +0900)
Change-Id: If82838fd4990947eb7bf542f604801720c3a9a99


Trivial merge