Merge branch 'devel/master' into tizen 28/175128/1
authorhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 04:56:40 +0000 (13:56 +0900)
committerhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 04:56:52 +0000 (13:56 +0900)
commitb9455f1f8798591d4a67c7ac116c67c65c2efe62
tree047db7b1633ccf0a7895a9982818d3f59a4674d4
parent98768de7da663004a317e97f5c1fcafd1bd10d52
parent31a46b2c4486c9c5e2534b7aa0b84189bb72b652
Merge branch 'devel/master' into tizen

Change-Id: I42ce5175be98d52dfd2dd13a40b379019b6edd23