Merge branch 'devel/master (1.2.39+)' into tizen 54/129454/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 16 May 2017 11:33:03 +0000 (20:33 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 16 May 2017 11:33:36 +0000 (20:33 +0900)
Change-Id: Ibb09b96ce593a2afdddbcb2dd876dba2a01c3461


Trivial merge