Merge branch 'devel/master' into tizen 12/124012/1 accepted/tizen/unified/20170410.160046 submit/tizen/20170410.071852
authorminho.sun <minho.sun@samsung.com>
Mon, 10 Apr 2017 02:22:52 +0000 (11:22 +0900)
committerminho.sun <minho.sun@samsung.com>
Mon, 10 Apr 2017 02:22:59 +0000 (11:22 +0900)
Change-Id: Ia3d847c7ae55fa1dd6f6c88928b609d8affc7293


Trivial merge