Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:14:54 +0000 (14:14 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:15:11 +0000 (14:15 +0900)
commit027b016ceccc1ed63ce7177dd626be6af4689fcb
tree7c88c040b13219c7031867611ba5d9aa1c4b998d
parent18378fe923142277611af061c1342f0296f51ce4
parent0f4138fd5020d18c0af1de77e39eba2d76c5b3a1
Merge branch 'devel/master' into tizen

Change-Id: Ie82fdec4284be0794093eb206db6de48ace32b39