Merge branch 'devel/master' into tizen 62/176962/1
authorDaekwang Ryu <dkdk.ryu@samsung.com>
Tue, 24 Apr 2018 10:22:30 +0000 (19:22 +0900)
committerDaekwang Ryu <dkdk.ryu@samsung.com>
Tue, 24 Apr 2018 10:22:30 +0000 (19:22 +0900)
Change-Id: Id92a4e67742b60b37e3c699967679d529a968232


Trivial merge