Merge branch 'devel/master' into tizen 25/179425/1
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 00:57:41 +0000 (09:57 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 00:57:45 +0000 (09:57 +0900)
commit92f60124b92e64ffb911a071e5493d3248ebf5ef
treee01a996b310b9b37f80f3136e1398be411603116
parent208babb81eb4edb429bfc583ca7bc4383418a1b0
parent5c20957f93fefc2c9d7ec3698521b2ee4b854300
Merge branch 'devel/master' into tizen

Change-Id: Iab41124b9e91f6bdb53029a467d220611988f96f