Merge branch 'devel/master' into tizen 20/179420/1
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 00:53:08 +0000 (09:53 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 00:53:12 +0000 (09:53 +0900)
commit265c8e7319c74698f96141d4c9f90e16ecd7ac23
tree8c74b86b4dbd046ead9b9ac06ff6a17e1efd39b3
parentdbb1ce9210c7ac437a687d94f1eec999359225a2
parentf9762c01b058bfdd949ce1c94f01a7976e311e4b
Merge branch 'devel/master' into tizen

Change-Id: I0ba1a012fa3872412d43270c6f1e7e6bb2462f2e