Merge branch 'devel/master' into tizen_4.0 70/155670/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 02:23:45 +0000 (11:23 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 02:23:54 +0000 (11:23 +0900)
Change-Id: I984cd2786a7a7dce687833cac4f719b65d57b53b


Trivial merge