Merge branch 'devel/master' into tizen 28/124028/1
authorminho.sun <minho.sun@samsung.com>
Mon, 10 Apr 2017 03:06:54 +0000 (12:06 +0900)
committerminho.sun <minho.sun@samsung.com>
Mon, 10 Apr 2017 03:26:09 +0000 (12:26 +0900)
Change-Id: I9dfdc9f432a65e4eebb18458b22897ae68ce77a3


Trivial merge