Merge branch 'devel/master' into tizen_4.0 80/147080/1 accepted/tizen/4.0/unified/20170907.192409 submit/tizen_4.0/20170901.082413 submit/tizen_4.0/20170907.133944
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 1 Sep 2017 01:36:12 +0000 (10:36 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 1 Sep 2017 01:36:18 +0000 (10:36 +0900)
Change-Id: I983fc1e5a00d1d438735f51ea0682b3c72a0e514


Trivial merge