Merge branch 'devel/master' into tizen 46/159946/1
authorHeeyong Song <heeyong.song@samsung.com>
Tue, 14 Nov 2017 01:15:17 +0000 (10:15 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 14 Nov 2017 01:15:22 +0000 (10:15 +0900)
Change-Id: Id2cca5d0a4109cf8041150538470877e74658003


Trivial merge