Merge branch 'devel/master' into tizen 17/176017/1
authorSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Apr 2018 06:23:09 +0000 (15:23 +0900)
committerSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Apr 2018 06:23:14 +0000 (15:23 +0900)
Change-Id: I6d03d36c3e3e63bba5bfed11726c3d9e7de08717


Trivial merge