Merge branch 'devel/master' into tizen 98/128198/1
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 8 May 2017 04:14:40 +0000 (13:14 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 8 May 2017 04:14:48 +0000 (13:14 +0900)
commitd63b3a80e56edf006afb035cb63ecf65e18f5b3a
tree9e3fa2189652c659014dc69a142add828365cf2f
parent54a136ba023318c87a0a391f9dfdce669716e9dd
parent3297b0f6bc987d2a8abdbc20258d99dd76cd1f04
Merge branch 'devel/master' into tizen

Change-Id: I0975d086de1558c523667665c9dff82af6af1908