Merge branch 'devel/master' into tizen 48/175148/1
authorhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 05:24:09 +0000 (14:24 +0900)
committerhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 05:24:20 +0000 (14:24 +0900)
commit80af02b8dda897d9cd90e92d862ecec675cbc123
tree797e6de436f5a653766aa6dcf61f286c041144b8
parent5a599d401be545526f2659c3c24d2c321585524d
parent703fe9266e9f76445948bf60937a00d963ecfc7a
Merge branch 'devel/master' into tizen

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