Merge branch 'devel/master' into tizen
authorWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 06:39:49 +0000 (15:39 +0900)
committerWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 06:39:56 +0000 (15:39 +0900)
commita2f84e03cce7c634f7ce2b91b481a5d816ac6ddd
treeaf8ad96f6df971d9c5a63ec919c360e88a507a39
parentdd4899999e8f5e7047be3b19dbdb2bdfdfc21157
parent508e9ca019f16dd224d3a40ee8f2356fe4ba1506
Merge branch 'devel/master' into tizen

Change-Id: Ibe06146397327bcb53af5b529b2c2a4496bd8fd5