Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 5 Nov 2018 08:34:06 +0000 (17:34 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 5 Nov 2018 08:34:11 +0000 (17:34 +0900)
commitf41ccfd66f8c7ea114e96204d8964dd40df6d665
tree22c54da692a859fd31552158bc381136a3176e1e
parentef25ba0ca91f7a37c69c859b24ffa66d7059fe36
parent1fef39064da60e6ee4f3ba3fd8ea01c3dbfb6757
Merge branch 'devel/master' into tizen

Change-Id: Ifef30efac27247c7019bef30306031e2ae8f09a7