Merge branch 'devel/master' into tizen 09/149309/1
authorHeeyong Song <heeyong.song@samsung.com>
Tue, 12 Sep 2017 05:27:46 +0000 (14:27 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 12 Sep 2017 05:27:54 +0000 (14:27 +0900)
Change-Id: I2348892a50ee941e4af4cb311c5e41cf1490a398


Trivial merge