Merge branch 'devel/master' into tizen_4.0 17/147117/1 accepted/tizen/4.0/unified/20170907.192423 submit/tizen_4.0/20170901.082413
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 1 Sep 2017 05:30:07 +0000 (14:30 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 1 Sep 2017 05:30:19 +0000 (14:30 +0900)
Change-Id: I47a75c3d37fe8fb454cb8b8d96ba93a0d50c498b


Trivial merge