Merge branch 'devel/master' into tizen_4.0 61/155661/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 02:12:55 +0000 (11:12 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 02:13:04 +0000 (11:13 +0900)
Change-Id: Iadf66b532e8d9b9540d91f76fb689a6e5ba1e082


Trivial merge