Merge branch 'devel/master' into tizen 38/159938/1
authorHeeyong Song <heeyong.song@samsung.com>
Tue, 14 Nov 2017 00:52:24 +0000 (09:52 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 14 Nov 2017 00:52:28 +0000 (09:52 +0900)
Change-Id: Ic0ca3a4c83ae5ea878d3d3a3fbc775eb5b80984c


Trivial merge