Merge branch 'devel/master' into tizen 27/175227/1 accepted/tizen/unified/20180412.073732 submit/tizen/20180409.102708 submit/tizen/20180410.045356
authorhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 10:24:52 +0000 (19:24 +0900)
committerhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 10:24:56 +0000 (19:24 +0900)
Change-Id: Ibf669e7cbdc3248b234c875ec59dfde251946a64
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>

Trivial merge