Merge branch 'devel/master' into tizen 35/124035/1 accepted/tizen/unified/20170410.160011 submit/tizen/20170410.071852
authorminho.sun <minho.sun@samsung.com>
Mon, 10 Apr 2017 03:32:29 +0000 (12:32 +0900)
committerminho.sun <minho.sun@samsung.com>
Mon, 10 Apr 2017 03:32:35 +0000 (12:32 +0900)
Change-Id: I435d9578cbf191b7e79dcdb43487931a8d44a190


Trivial merge