Merge branch 'devel/master' into tizen 01/62901/1
authorminho.sun <minho.sun@samsung.com>
Mon, 21 Mar 2016 02:26:04 +0000 (11:26 +0900)
committerminho.sun <minho.sun@samsung.com>
Mon, 21 Mar 2016 05:44:38 +0000 (14:44 +0900)
Change-Id: Iedbf4b48b1af033a32ac9df7930ab1211e4295d2


Trivial merge