Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 5 Nov 2018 07:52:03 +0000 (16:52 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 5 Nov 2018 07:52:03 +0000 (16:52 +0900)
commitba8dba92457e55abb3c9c369856930dc65931db9
tree4bf64d7e2645fd115acd60c24e84c23b32e511cd
parentf3099a05f68bd71dd0a33261d5dd7a03d67ad381
parentfd8b242b2825b1cb7cfba90fa0c4cfdd8d9b8157
Merge branch 'devel/master' into tizen

Change-Id: Ib74deb609528d9d86680efbb3a8b244d017de244