Merge branch 'devel/master (1.2.49)' into tizen 41/140141/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Mon, 24 Jul 2017 03:13:12 +0000 (12:13 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Mon, 24 Jul 2017 03:13:32 +0000 (12:13 +0900)
Change-Id: Iabca1d0dcb6f69108867952d8eed05dd48a6e6c2

1  2 
adaptors/ecore/wayland/event-handler-ecore-wl.cpp
build/tizen/adaptor/Makefile.am

Simple merge