Merge branch 'devel/master' into tizen 58/175158/1
authorhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 05:48:08 +0000 (14:48 +0900)
committerhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 05:51:15 +0000 (14:51 +0900)
commit1288c0e6602d0edfe94d7a9e6b1078bfa8ab597f
tree78a7dc49257bd910c61b1b3673ce30d5d8e11bba
parent23c44283b96238b1e8b08f3935f5ac7ff2af9ecc
parent276f6dcc3df8345ed2528fd7ecdb68988a420045
Merge branch 'devel/master' into tizen

Change-Id: I915cb74621f4e6cab2152498344435a4381e4eba
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>