Merge branch 'devel/master' into tizen 87/176987/1 accepted/tizen/unified/20180426.062516 submit/tizen/20180425.074123
authorDaekwang Ryu <dkdk.ryu@samsung.com>
Tue, 24 Apr 2018 06:47:21 +0000 (15:47 +0900)
committerDaekwang Ryu <dkdk.ryu@samsung.com>
Tue, 24 Apr 2018 06:47:21 +0000 (15:47 +0900)
Change-Id: I12d852e55c7cda3e9925d6d2cfa6974a6e749dfe


Trivial merge