Merge branch 'devel/master' into tizen 83/141683/1 accepted/tizen/unified/20170809.015326 submit/tizen/20170804.104325 submit/tizen/20170804.104701
authorminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 06:36:29 +0000 (15:36 +0900)
committerminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 06:36:36 +0000 (15:36 +0900)
Change-Id: I72105b282b088da071777c66ed9394344b490e0a


Trivial merge