Merge branch 'devel/master' into tizen 05/176005/1 accepted/tizen/unified/20180417.173113 submit/tizen/20180416.110235
authorSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Apr 2018 06:01:48 +0000 (15:01 +0900)
committerSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Apr 2018 06:02:26 +0000 (15:02 +0900)
Change-Id: Ib483391ba40fa268ae7f323f8a73642164e36443


Trivial merge