Merge branch 'devel/master' into tizen
authorWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 08:33:06 +0000 (17:33 +0900)
committerWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 08:33:14 +0000 (17:33 +0900)
commit655ca1492e208e5ae40ad3670feac095526b2677
treecf558608979988fbf9fb9ada799bd142d0d20c8a
parent260f65f195b2868e93f68476e411c38a1569dba9
parent7d3f96aea32564e6fa140f5165972eb1f4701694
Merge branch 'devel/master' into tizen

Change-Id: If9acf05b577d857efe190ef8aaeb84b8d9b54832