Merge branch 'devel/master (1.1.2 ~ 1.1.7)' into tizen 27/50327/2
authortaeyoon <taeyoon0.lee@samsung.com>
Wed, 28 Oct 2015 05:43:12 +0000 (14:43 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Wed, 28 Oct 2015 05:44:28 +0000 (14:44 +0900)
Change-Id: Id1a7388e648991759ade506fcbd46437a1491519

1  2 
build/tizen/adaptor/Makefile.am

Simple merge