Merge branch 'devel/master' into tizen_4.0 25/155725/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 04:54:39 +0000 (13:54 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 04:55:36 +0000 (13:55 +0900)
Change-Id: Ibe67a6e65c2e90d1df86930e4e7043bcb3167b3a


Trivial merge