Merge branch 'devel/master' into tizen 28/175128/1
authorhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 04:56:40 +0000 (13:56 +0900)
committerhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 04:56:52 +0000 (13:56 +0900)
Change-Id: I42ce5175be98d52dfd2dd13a40b379019b6edd23


Trivial merge