Merge branch 'devel/master(1.1.39)' into tizen 07/75407/1
authortaeyoon <taeyoon0.lee@samsung.com>
Sat, 18 Jun 2016 04:43:25 +0000 (13:43 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Sat, 18 Jun 2016 04:43:50 +0000 (13:43 +0900)
Change-Id: I2da3fdb58440d3fca36c414482d4b0f1ee50a771

1  2 
build/tizen/adaptor/Makefile.am

Simple merge