Merge branch 'devel/master' into tizen 21/181221/1
authorWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 06:01:42 +0000 (15:01 +0900)
committerWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 06:02:01 +0000 (15:02 +0900)
commit22f7a35a5724c498fa81e6c581b81528f34a0049
tree1e5b0a4642424494fbba9a9012b294aa5cfac748
parentca3e2a6803264c7183163e1b7b648afa4764d4fb
parentc718b768750d803fba84337c7b7e548b12249468
Merge branch 'devel/master' into tizen

Change-Id: I46f1bb55620dcb4158fc28c31f699f47ed8dd0a3