Merge branch 'devel/master' into tizen 82/141682/1 accepted/tizen/unified/20170809.015320 submit/tizen/20170804.104325 submit/tizen/20170804.104701
authorminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:14:38 +0000 (10:14 +0900)
committerminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:14:45 +0000 (10:14 +0900)
Change-Id: I399c2bffd2cbfad7207c31ccc286dd3911d5113a


Trivial merge