Merge branch 'devel/master' into tizen 06/176006/1 accepted/tizen/unified/20180417.173118 submit/tizen/20180416.110235
authorSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Apr 2018 06:03:08 +0000 (15:03 +0900)
committerSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Apr 2018 06:03:50 +0000 (15:03 +0900)
Change-Id: I42ede25c06b87bd682f2327102e2e54d8dc12a59


Trivial merge