Merge branch 'devel/master' into tizen 82/143982/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 14 Aug 2017 06:38:19 +0000 (15:38 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 14 Aug 2017 06:38:29 +0000 (15:38 +0900)
Change-Id: I5ddb44d0163b6d48a1578ec92413d9348c32b2fa


Trivial merge