Merge branch 'devel/master' into tizen 10/176010/1
authorSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Apr 2018 06:18:00 +0000 (15:18 +0900)
committerSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Apr 2018 06:18:09 +0000 (15:18 +0900)
Change-Id: I492b61d6d98775896c25abee6898fd9926ca28b4


Trivial merge