Merge branch 'devel/master' into tizen 83/175983/1
authorSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Apr 2018 05:35:28 +0000 (14:35 +0900)
committerSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Apr 2018 05:35:54 +0000 (14:35 +0900)
Change-Id: I9e272742a05f3f61d30437c4d6d2e2758bd698d6


Trivial merge