Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:05:50 +0000 (14:05 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:05:55 +0000 (14:05 +0900)
commit679c9dc57beee80411d05489eafbc0f550088da3
treeeb2761aa0fc5564531468e8050c6f5405b2d3ac6
parenta635e7ec3e02dcf4385014339792e9ff29aa7aa3
parent0e1d23a6735024821ae862c85f758c4c4d27bcf3
Merge branch 'devel/master' into tizen

Change-Id: I14a31ace7454080e23eb17028ddacbadaa4190a8