Merge branch 'devel/master' into tizen_4.0 71/147071/1
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 1 Sep 2017 01:19:04 +0000 (10:19 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 1 Sep 2017 01:19:08 +0000 (10:19 +0900)
Change-Id: If1c22917e3365d42f99221f04f28115c1c006daa


Trivial merge