Merge branch 'devel/master (1.2.49)' into tizen 21/140121/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Mon, 24 Jul 2017 03:02:29 +0000 (12:02 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Mon, 24 Jul 2017 03:03:08 +0000 (12:03 +0900)
commit90c71466dc82244af67e9b027cc4f6a20d91f1cb
tree4332b2da55b7e3297a298d68070bfc115bbfdb34
parentccfa69a7d37b27e4975ad1fd02a293a2bca97900
parent080e6bbcb72c7d8fde762b7024e71dbe34f65367
Merge branch 'devel/master (1.2.49)' into tizen

Change-Id: I5395b8d828690e519b1699f25b8fa7ef50066308