Merge branch 'devel/master (1.2.0)' into tizen 76/83176/1
authortaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 09:39:05 +0000 (18:39 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 09:39:31 +0000 (18:39 +0900)
Change-Id: Ia042718055effd6f9b81fac30fc48011eedaaf2b

1  2 
build/tizen/adaptor/Makefile.am
platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp

Simple merge