Merge branch 'devel/master' into tizen 77/149377/1
authorHeeyong Song <heeyong.song@samsung.com>
Tue, 12 Sep 2017 06:45:57 +0000 (15:45 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 12 Sep 2017 06:46:01 +0000 (15:46 +0900)
Change-Id: If63f065c2d06271ecb601e9db2d30f0693adcb4a


Trivial merge