Merge branch 'tizen_3.0' into tizen_4.0

Change-Id: I760b35399e2790ffd0d09fae7df56fe1201baff2
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --cc daemon/Makefile
index 5547dce895fd0e4372ae2349d685093081563558,d1f6d1b26d51d3434ce2c8b9e5c0f057308383ff..2337c1100d397a34e915d25817785a080a5e04b9
--- 1/daemon/Makefile
--- 2/daemon/Makefile
+++ b/daemon/Makefile
@@@ -105,7 -106,9 +105,8 @@@ SRC_C := 
        smack.c \
        malloc_debug.c \
        target.c \
-       thread.c
+       thread.c \
 -      thread_cond.c \
 -      ui_viewer.c
++      thread_cond.c
  
  SRC_CPP := \
        cpp/features/feature.cpp \

diff --cc daemon/da_protocol.c
Simple merge

diff --cc daemon/threads.c
Simple merge

diff --cc packaging/swap-manager.spec
Simple merge