Merge branch 'devel/master (1.2.39+)' into tizen 60/129460/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 16 May 2017 11:38:54 +0000 (20:38 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 16 May 2017 11:39:28 +0000 (20:39 +0900)
commita2d531eadbefb12eee9ee666b14fa3cb3d314f9b
tree7420830a32371be9175c184ad7217104abba8227
parent04e53324b96a314001815b1b3a3d40bcdacae02a
parent526e8e4019229f0ae7eab6f4145df61ac3b46999
Merge branch 'devel/master (1.2.39+)' into tizen

Change-Id: I1af4dd2b90784313c54af4cb4a6a4075b9ff536b