Merge branch 'devel/master' into tizen_4.0 35/147035/1
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 1 Sep 2017 00:25:59 +0000 (09:25 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 1 Sep 2017 00:26:04 +0000 (09:26 +0900)
Change-Id: I5d7600385ce3019adc228c201fd42611373f038e


Trivial merge