Merge branch 'devel/master' into tizen
authorJoogab Yun <joogab.yun@samsung.com>
Mon, 9 Jul 2018 05:05:14 +0000 (14:05 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Mon, 9 Jul 2018 05:05:22 +0000 (14:05 +0900)
Change-Id: Ic745288184a8bca9bad557bce2ca8e545484eb4e


Trivial merge