Merge branch 'devel/master' into tizen 00/124000/1
authorminho.sun <minho.sun@samsung.com>
Mon, 10 Apr 2017 02:01:15 +0000 (11:01 +0900)
committerminho.sun <minho.sun@samsung.com>
Mon, 10 Apr 2017 02:01:35 +0000 (11:01 +0900)
Change-Id: I374ed5468fcab45e4a158353d86e15db0263f40f


Trivial merge